Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for codegen rejecting operations that contain fragments with type conditions on interfaces #243

Merged
merged 2 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion sgqlc/codegen/operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ def _create_type(self, typ):
possible_types = typ['possibleTypes'] or typ['interfaces'] or []
typ['possibleTypes'] = {t['name'] for t in possible_types}

interfaces = typ['interfaces'] or []
typ['interfaces'] = {t['name'] for t in interfaces}

return typ

def _create_field(self, field):
Expand Down Expand Up @@ -743,7 +746,8 @@ def enter_inline_fragment(self, node, *_args):
self.type_stack.append(None)
return
type_name = node.type_condition.name.value
if type_name not in typ['possibleTypes']:
condition_type = self.validation.get_type(type_name)
if not self._type_valid_in_fragment(condition_type, typ):
self.report_possible_type_validation(node, typ, type_name)

try:
Expand All @@ -752,6 +756,13 @@ def enter_inline_fragment(self, node, *_args):
except KeyError as ex:
self.report_type_validation(node, ex)

@staticmethod
def _type_valid_in_fragment(condition_type, fragment_type):
return (
fragment_type['name'] in condition_type['interfaces']
or condition_type['name'] in fragment_type['possibleTypes']
)

def leave_inline_fragment(self, node, *_args):
self.type_stack.pop()
return (
Expand Down
29 changes: 29 additions & 0 deletions tests/test-operation-codegen.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import os
from io import StringIO
from graphql import Source

from sgqlc.codegen.operation import CodeGen, load_schema, ParsedSchemaName


def test_operation_gen_nested_interface():
result_buff = StringIO()
test_schema_path = os.path.join(
'tests', 'test-resources', 'operation-codegen', 'operation-test.json'
)
test_op_path = os.path.join(
'tests', 'test-resources', 'operation-codegen', 'op-gen.gql'
)
schema_name = ParsedSchemaName.parse_schema_name('.schema')

with open(test_op_path) as op_file, open(test_schema_path) as schema_file:
operation_gql = [Source(op_file.read(), op_file.name)]
schema = load_schema(schema_file)
gen = CodeGen(
schema,
schema_name,
operation_gql,
result_buff.write,
short_names=False,
)
gen.write()
result_buff.close()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll approve, but let me know if you can convert this test to be more self contained, instead of using external files. Declare a minimal subset as strings in this file.

Also, I think it would be great to check the generated result_buff to make sure it's what we expect :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep I can do that, I will try to get to it today or a bit later on the weekend.

7 changes: 7 additions & 0 deletions tests/test-resources/operation-codegen/op-gen.gql
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
query QueryFieldOnNestedInterface {
foo {
... on Bar {
barField
}
}
}
Loading
Loading