diff --git a/src/graphql/type/assert_name.py b/src/graphql/type/assert_name.py index b335cd07..5a39e5ac 100644 --- a/src/graphql/type/assert_name.py +++ b/src/graphql/type/assert_name.py @@ -29,6 +29,8 @@ def assert_name(name: str) -> str: if not name: msg = "Expected name to be a non-empty string." raise GraphQLError(msg) + if name.isascii() and name.isidentifier(): + return name # an ASCII identifier is exactly a GraphQL name if not all(is_name_continue(char) for char in name[1:]): msg = f"Names must only contain [_a-zA-Z0-9] but {name!r} does not." raise GraphQLError(msg) diff --git a/tests/type/test_assert_name.py b/tests/type/test_assert_name.py index 79bd3ef8..513c83b0 100644 --- a/tests/type/test_assert_name.py +++ b/tests/type/test_assert_name.py @@ -8,6 +8,16 @@ def describe_assert_name(): def pass_through_valid_name(): assert assert_name("_ValidName123") == "_ValidName123" + def pass_through_valid_name_without_the_shortcut(): + class Name(str): + __slots__ = () + + def isidentifier(self) -> bool: + return False + + name = Name("_ValidName123") + assert assert_name(name) is name + def throws_on_empty_strings(): with pytest.raises(GraphQLError) as exc_info: assert_name("")