From 2b1bfa95fa9f6e6cb6b1cf61a8d88583dcca9cd8 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Sat, 10 May 2025 20:30:26 +0200
Subject: [PATCH 1/5] Change snakecase to camelcase for prop

---
 compiler/core/js_dump.ml              | 13 +++++++++++++
 tests/tests/src/jsx_preserve_test.mjs |  5 +++++
 tests/tests/src/jsx_preserve_test.res |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/compiler/core/js_dump.ml b/compiler/core/js_dump.ml
index fc61d06b51..ac1b727f21 100644
--- a/compiler/core/js_dump.ml
+++ b/compiler/core/js_dump.ml
@@ -1154,6 +1154,19 @@ and print_jsx cxt ?(spread_props : J.expression option)
     in
 
     let print_prop n x ctx =
+      let n =
+        (* turn aria-label to ariaLabel *)
+        if not (String.contains n '-') then n
+        else
+          let chars = String.to_seq n |> List.of_seq in
+          let rec visit chars acc =
+            match chars with
+            | [] -> List.rev acc
+            | '-' :: l :: rest -> visit rest (Char.uppercase_ascii l :: acc)
+            | c :: rest -> visit rest (c :: acc)
+          in
+          visit chars [] |> List.to_seq |> String.of_seq
+      in
       let prop_name = Js_dump_property.property_key_string n in
       P.string f prop_name;
       P.string f "=";
diff --git a/tests/tests/src/jsx_preserve_test.mjs b/tests/tests/src/jsx_preserve_test.mjs
index da9c00766f..17d860d839 100644
--- a/tests/tests/src/jsx_preserve_test.mjs
+++ b/tests/tests/src/jsx_preserve_test.mjs
@@ -203,6 +203,10 @@ let _optional_props = <Jsx_preserve_test$ComponentWithOptionalProps
   element={<div />}
 />;
 
+let _props_with_hypen = <label
+  ariaLabel="close sidebar"
+/>;
+
 export {
   Icon,
   _single_element_child,
@@ -228,5 +232,6 @@ export {
   _large_component,
   ComponentWithOptionalProps,
   _optional_props,
+  _props_with_hypen,
 }
 /* _single_element_child Not a pure module */
diff --git a/tests/tests/src/jsx_preserve_test.res b/tests/tests/src/jsx_preserve_test.res
index b6814b0c5c..c6ffdd52d2 100644
--- a/tests/tests/src/jsx_preserve_test.res
+++ b/tests/tests/src/jsx_preserve_test.res
@@ -126,3 +126,5 @@ module ComponentWithOptionalProps = {
 }
 
 let _optional_props = <ComponentWithOptionalProps i=1 s="test" element={<div />} />
+
+let _props_with_hypen = <label ariaLabel={"close sidebar"} />
\ No newline at end of file

From ba16895ac9fe74ed9b55417072524f29686a1a44 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Mon, 12 May 2025 08:18:01 +0200
Subject: [PATCH 2/5] Format test

---
 tests/tests/src/jsx_preserve_test.res | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests/src/jsx_preserve_test.res b/tests/tests/src/jsx_preserve_test.res
index c6ffdd52d2..051b1431bf 100644
--- a/tests/tests/src/jsx_preserve_test.res
+++ b/tests/tests/src/jsx_preserve_test.res
@@ -127,4 +127,4 @@ module ComponentWithOptionalProps = {
 
 let _optional_props = <ComponentWithOptionalProps i=1 s="test" element={<div />} />
 
-let _props_with_hypen = <label ariaLabel={"close sidebar"} />
\ No newline at end of file
+let _props_with_hypen = <label ariaLabel={"close sidebar"} />

From 73a519af555bee7386c7090c19b1777a54eaf823 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Mon, 12 May 2025 08:19:45 +0200
Subject: [PATCH 3/5] Preserve snake case for area labels

---
 compiler/core/js_dump.ml              | 16 +++-------------
 tests/tests/src/jsx_preserve_test.mjs |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/compiler/core/js_dump.ml b/compiler/core/js_dump.ml
index ac1b727f21..a82c52614d 100644
--- a/compiler/core/js_dump.ml
+++ b/compiler/core/js_dump.ml
@@ -1154,20 +1154,10 @@ and print_jsx cxt ?(spread_props : J.expression option)
     in
 
     let print_prop n x ctx =
-      let n =
-        (* turn aria-label to ariaLabel *)
-        if not (String.contains n '-') then n
-        else
-          let chars = String.to_seq n |> List.of_seq in
-          let rec visit chars acc =
-            match chars with
-            | [] -> List.rev acc
-            | '-' :: l :: rest -> visit rest (Char.uppercase_ascii l :: acc)
-            | c :: rest -> visit rest (c :: acc)
-          in
-          visit chars [] |> List.to_seq |> String.of_seq
+      let prop_name =
+        if String.starts_with ~prefix:"aria-" n then n
+        else Js_dump_property.property_key_string n
       in
-      let prop_name = Js_dump_property.property_key_string n in
       P.string f prop_name;
       P.string f "=";
       print_prop_value x ctx
diff --git a/tests/tests/src/jsx_preserve_test.mjs b/tests/tests/src/jsx_preserve_test.mjs
index 17d860d839..6d06c7323b 100644
--- a/tests/tests/src/jsx_preserve_test.mjs
+++ b/tests/tests/src/jsx_preserve_test.mjs
@@ -204,7 +204,7 @@ let _optional_props = <Jsx_preserve_test$ComponentWithOptionalProps
 />;
 
 let _props_with_hypen = <label
-  ariaLabel="close sidebar"
+  aria-label="close sidebar"
 />;
 
 export {

From 351dfc70ea9644c766420bfc43e7cf216c291323 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Mon, 12 May 2025 09:04:04 +0200
Subject: [PATCH 4/5] Only unwrap uppercase exotic ident in prop name

---
 compiler/core/js_dump.ml              | 5 +----
 compiler/core/js_dump_property.ml     | 8 +++-----
 compiler/core/js_dump_property.mli    | 2 --
 tests/tests/src/jsx_preserve_test.mjs | 1 +
 tests/tests/src/jsx_preserve_test.res | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/compiler/core/js_dump.ml b/compiler/core/js_dump.ml
index a82c52614d..11c0aeb4a7 100644
--- a/compiler/core/js_dump.ml
+++ b/compiler/core/js_dump.ml
@@ -1154,10 +1154,7 @@ and print_jsx cxt ?(spread_props : J.expression option)
     in
 
     let print_prop n x ctx =
-      let prop_name =
-        if String.starts_with ~prefix:"aria-" n then n
-        else Js_dump_property.property_key_string n
-      in
+      let prop_name = Ext_ident.unwrap_uppercase_exotic n in
       P.string f prop_name;
       P.string f "=";
       print_prop_value x ctx
diff --git a/compiler/core/js_dump_property.ml b/compiler/core/js_dump_property.ml
index 76bb7ec363..6df115808b 100644
--- a/compiler/core/js_dump_property.ml
+++ b/compiler/core/js_dump_property.ml
@@ -81,11 +81,9 @@ let property_access f s =
         | _ -> Js_dump_string.pp_string f s
         | exception _ -> Js_dump_string.pp_string f s)
 
-let property_key_string (s : string) : string =
-  let s = Ext_ident.unwrap_uppercase_exotic s in
-  if obj_property_no_need_quot s then s else Js_dump_string.escape_to_string s
-
 let property_key (s : J.property_name) : string =
   match s with
-  | Lit s -> property_key_string s
+  | Lit s ->
+    let s = Ext_ident.unwrap_uppercase_exotic s in
+    if obj_property_no_need_quot s then s else Js_dump_string.escape_to_string s
   | Symbol_name -> {|[Symbol.for("name")]|}
diff --git a/compiler/core/js_dump_property.mli b/compiler/core/js_dump_property.mli
index 7404413736..2e675b1816 100644
--- a/compiler/core/js_dump_property.mli
+++ b/compiler/core/js_dump_property.mli
@@ -25,5 +25,3 @@
 val property_access : Ext_pp.t -> string -> unit
 
 val property_key : J.property_name -> string
-
-val property_key_string : string -> string
diff --git a/tests/tests/src/jsx_preserve_test.mjs b/tests/tests/src/jsx_preserve_test.mjs
index 6d06c7323b..b29c521a9a 100644
--- a/tests/tests/src/jsx_preserve_test.mjs
+++ b/tests/tests/src/jsx_preserve_test.mjs
@@ -205,6 +205,7 @@ let _optional_props = <Jsx_preserve_test$ComponentWithOptionalProps
 
 let _props_with_hypen = <label
   aria-label="close sidebar"
+  data-testid="test"
 />;
 
 export {
diff --git a/tests/tests/src/jsx_preserve_test.res b/tests/tests/src/jsx_preserve_test.res
index 051b1431bf..87049f91aa 100644
--- a/tests/tests/src/jsx_preserve_test.res
+++ b/tests/tests/src/jsx_preserve_test.res
@@ -127,4 +127,4 @@ module ComponentWithOptionalProps = {
 
 let _optional_props = <ComponentWithOptionalProps i=1 s="test" element={<div />} />
 
-let _props_with_hypen = <label ariaLabel={"close sidebar"} />
+let _props_with_hypen = <label ariaLabel={"close sidebar"} dataTestId="test" />

From be40265c895bbcbb8c57e05fce7abb12a01ace1c Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Mon, 12 May 2025 09:30:02 +0200
Subject: [PATCH 5/5] hyphen

---
 tests/tests/src/jsx_preserve_test.mjs | 4 ++--
 tests/tests/src/jsx_preserve_test.res | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/tests/src/jsx_preserve_test.mjs b/tests/tests/src/jsx_preserve_test.mjs
index b29c521a9a..529ab697ef 100644
--- a/tests/tests/src/jsx_preserve_test.mjs
+++ b/tests/tests/src/jsx_preserve_test.mjs
@@ -203,7 +203,7 @@ let _optional_props = <Jsx_preserve_test$ComponentWithOptionalProps
   element={<div />}
 />;
 
-let _props_with_hypen = <label
+let _props_with_hyphen = <label
   aria-label="close sidebar"
   data-testid="test"
 />;
@@ -233,6 +233,6 @@ export {
   _large_component,
   ComponentWithOptionalProps,
   _optional_props,
-  _props_with_hypen,
+  _props_with_hyphen,
 }
 /* _single_element_child Not a pure module */
diff --git a/tests/tests/src/jsx_preserve_test.res b/tests/tests/src/jsx_preserve_test.res
index 87049f91aa..1c83f06f26 100644
--- a/tests/tests/src/jsx_preserve_test.res
+++ b/tests/tests/src/jsx_preserve_test.res
@@ -127,4 +127,4 @@ module ComponentWithOptionalProps = {
 
 let _optional_props = <ComponentWithOptionalProps i=1 s="test" element={<div />} />
 
-let _props_with_hypen = <label ariaLabel={"close sidebar"} dataTestId="test" />
+let _props_with_hyphen = <label ariaLabel={"close sidebar"} dataTestId="test" />