Merge pull request #279 from spicyPug02/update-snake-case-regex-util

Fix str to snake to capture uppercase words followed by an underscore

Author: rafalp

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 0.13.0 (UNRELEASED)
 
+- Fixed `str_to_snake_case` utility to capture fully capitalized words followed by an underscore.
+
 
 ## 0.12.0 (2024-02-05)
 

ariadne_codegen/utils.py

@@ -55,7 +55,7 @@ def str_to_snake_case(name: str) -> str:
     # lower-case letters that optionally start with a single upper-case letter
     lowercase_words = r"[A-Z]?[a-z]+"
     # upper-case letters, excluding last letter if it is followed by a lower-case letter
-    uppercase_words = r"[A-Z]+(?=[A-Z][a-z]|\d|\W|$)"
+    uppercase_words = r"[A-Z]+(?=[A-Z][a-z]|\d|\W|_|$)"
     numbers = r"\d+"
 
     words = re.findall(rf"{lowercase_words}|{uppercase_words}|{numbers}", name)

tests/test_utils.py

@@ -84,9 +84,12 @@ class TestClass(Efg):
         ("Test", "test"),
         ("TEST", "test"),
         ("test_word", "test_word"),
+        ("TEST_word", "test_word"),
+        ("testTEST__Word3", "test_test_word_3"),
         ("TestWord", "test_word"),
         ("testWord", "test_word"),
         ("TESTWord", "test_word"),
+        ("TEST%Word", "test_word"),
         ("testWORD", "test_word"),
         ("testW", "test_w"),
         ("TestW", "test_w"),