Fix camel to snake case conversion with digits (#140)

Author: Cito

src/graphql/pyutils/convert_case.py

@@ -4,7 +4,7 @@
 
 __all__ = ["camel_to_snake", "snake_to_camel"]
 
-_re_camel_to_snake = re.compile(r"([a-z]|[A-Z]+)(?=[A-Z])")
+_re_camel_to_snake = re.compile(r"([a-z]|[A-Z0-9]+)(?=[A-Z])")
 _re_snake_to_camel = re.compile(r"(_)([a-z\d])")
 
 

tests/pyutils/test_convert_case.py

@@ -3,49 +3,54 @@
 
 def describe_camel_to_snake():
     def converts_typical_names():
-        result = camel_to_snake("CamelCase")
-        assert result == "camel_case"
-        result = camel_to_snake("InputObjectTypeExtensionNode")
-        assert result == "input_object_type_extension_node"
+        assert camel_to_snake("CamelCase") == "camel_case"
+        assert (
+            camel_to_snake("InputObjectTypeExtensionNode")
+            == "input_object_type_extension_node"
+        )
+        assert camel_to_snake("CamelToSnake") == "camel_to_snake"
 
     def may_start_with_lowercase():
-        result = camel_to_snake("CamelCase")
-        assert result == "camel_case"
+        assert camel_to_snake("camelCase") == "camel_case"
 
     def works_with_acronyms():
-        result = camel_to_snake("SlowXMLParser")
-        assert result == "slow_xml_parser"
-        result = camel_to_snake("FastGraphQLParser")
-        assert result == "fast_graph_ql_parser"
+        assert camel_to_snake("SlowXMLParser") == "slow_xml_parser"
+        assert camel_to_snake("FastGraphQLParser") == "fast_graph_ql_parser"
+
+    def works_with_numbers():
+        assert camel_to_snake("Python3Script") == "python3_script"
+        assert camel_to_snake("camel2snake") == "camel2snake"
 
     def keeps_already_snake():
-        result = camel_to_snake("snake_case")
-        assert result == "snake_case"
+        assert camel_to_snake("snake_case") == "snake_case"
 
 
 def describe_snake_to_camel():
     def converts_typical_names():
-        result = snake_to_camel("snake_case")
-        assert result == "SnakeCase"
-        result = snake_to_camel("input_object_type_extension_node")
-        assert result == "InputObjectTypeExtensionNode"
+        assert snake_to_camel("snake_case") == "SnakeCase"
+        assert (
+            snake_to_camel("input_object_type_extension_node")
+            == "InputObjectTypeExtensionNode"
+        )
+        assert snake_to_camel("snake_to_camel") == "SnakeToCamel"
 
     def may_start_with_uppercase():
-        result = snake_to_camel("Snake_case")
-        assert result == "SnakeCase"
+        assert snake_to_camel("Snake_case") == "SnakeCase"
 
     def works_with_acronyms():
-        result = snake_to_camel("slow_xml_parser")
-        assert result == "SlowXmlParser"
-        result = snake_to_camel("fast_graph_ql_parser")
-        assert result == "FastGraphQlParser"
+        assert snake_to_camel("slow_xml_parser") == "SlowXmlParser"
+        assert snake_to_camel("fast_graph_ql_parser") == "FastGraphQlParser"
+
+    def works_with_numbers():
+        assert snake_to_camel("python3_script") == "Python3Script"
+        assert snake_to_camel("snake2camel") == "Snake2camel"
 
     def keeps_already_camel():
-        result = snake_to_camel("CamelCase")
-        assert result == "CamelCase"
+        assert snake_to_camel("CamelCase") == "CamelCase"
 
     def can_produce_lower_camel_case():
-        result = snake_to_camel("snake_case", upper=False)
-        assert result == "snakeCase"
-        result = snake_to_camel("input_object_type_extension_node", False)
-        assert result == "inputObjectTypeExtensionNode"
+        assert snake_to_camel("snake_case", upper=False) == "snakeCase"
+        assert (
+            snake_to_camel("input_object_type_extension_node", False)
+            == "inputObjectTypeExtensionNode"
+        )