From aae5ba399d17807ed44ca9e1b3f4e85650503646 Mon Sep 17 00:00:00 2001
From: Dan Ring <dfring@gmail.com>
Date: Thu, 23 Mar 2023 10:53:58 -0600
Subject: [PATCH] Fix federation support for directives without surrounding
whitespace (#1049)
---
CHANGELOG.md | 1 +
ariadne/contrib/federation/utils.py | 5 +++--
tests/federation/test_utils.py | 6 ++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b3e5c543..6ff1dd3eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
- Added support for passing `Enum` types directly to `make_executable_schema`
- Added `convert_names_case` option to `make_federated_schema`.
- Added support for the `@interfaceObject` directive in Apollo Federation.
+- Fixed federation support for directives without surrounding whitespace.
## 0.18.1 (2023-02-22)
diff --git a/ariadne/contrib/federation/utils.py b/ariadne/contrib/federation/utils.py
index 91880535a..6a0f483e2 100644
--- a/ariadne/contrib/federation/utils.py
+++ b/ariadne/contrib/federation/utils.py
@@ -23,8 +23,9 @@
_r_directive_definition = re.compile(
"("
- f"{_i_token_delimiter}"
- f"(?:{_i_token_description_block_string}|{_i_token_description_single_line})??"
+ f"(?:{_i_token_delimiter}(?:"
+ f"{_i_token_description_block_string}|{_i_token_description_single_line}"
+ "))??"
f"{_i_token_delimiter}directive"
f"(?:{_i_token_delimiter})?@({_i_token_name})"
f"(?:(?:{_i_token_delimiter})?{_i_token_arguments})?"
diff --git a/tests/federation/test_utils.py b/tests/federation/test_utils.py
index 851ccc7be..d6ef51ef5 100644
--- a/tests/federation/test_utils.py
+++ b/tests/federation/test_utils.py
@@ -121,6 +121,12 @@ def test_purge_directives_remove_custom_directives_with_single_line_description(
)
+def test_purge_directives_without_leading_whitespace():
+ type_defs = "#\ndirective @custom on FIELD"
+
+ assert sic(purge_schema_directives(type_defs)) == ""
+
+
def test_get_entity_types_with_key_directive():
type_defs = """
type Query {