Merge branch 'main' into fix/include-directive-result-type

CHANGELOG.md

@@ -4,7 +4,8 @@
 
 - Added `ClientForwardRefsPlugin` to standard plugins.
 - Re-added `model_rebuild` calls for input types with forward references.
-- Fixed `@Include` directive result type when using `convert_to_snake_case` option
+- Fixed fragments on interfaces being omitted from generated client.
+- Fixed `@Include` directive result type when using `convert_to_snake_case` option.
 
 
 ## 0.13.0 (2024-03-4)

ariadne_codegen/client_generators/result_types.py

@@ -327,9 +327,12 @@ def _resolve_selection_set(
                     fields.extend(sub_fields)
                     fragments = fragments.union(sub_fragments)
             elif isinstance(selection, InlineFragmentNode):
-                if selection.type_condition.name.value == root_type:
+                root_type_value = self._get_inline_fragment_root_type(
+                    selection.type_condition.name.value, root_type
+                )
+                if root_type_value:
                     sub_fields, sub_fragments = self._resolve_selection_set(
-                        selection.selection_set, root_type
+                        selection.selection_set, root_type_value
                     )
                     fields.extend(sub_fields)
                     fragments = fragments.union(sub_fragments)
@@ -338,6 +341,23 @@ def _resolve_selection_set(
         )
         return fields, fragments
 
+    def _get_inline_fragment_root_type(
+        self, selection_value: str, root_type: str
+    ) -> Optional[str]:
+        type_ = self.schema.type_map.get(root_type)
+        if not type_:
+            return None
+
+        if isinstance(type_, GraphQLObjectType) and selection_value in {
+            interface.name for interface in type_.interfaces
+        }:
+            return selection_value
+
+        if selection_value == root_type:
+            return root_type
+
+        return None
+
     def _unpack_fragment(
         self,
         fragment_def: FragmentDefinitionNode,

tests/main/clients/interface_as_fragment/expected_client/__init__.py

@@ -0,0 +1,35 @@
+from .async_base_client import AsyncBaseClient
+from .base_model import BaseModel, Upload
+from .client import Client
+from .exceptions import (
+    GraphQLClientError,
+    GraphQLClientGraphQLError,
+    GraphQLClientGraphQLMultiError,
+    GraphQLClientHttpError,
+    GraphQLClientInvalidResponseError,
+)
+from .fragments import Item, ItemError
+from .my_mutation import (
+    MyMutation,
+    MyMutationChangeItem,
+    MyMutationChangeItemContacts,
+    MyMutationChangeItemErrorsItemServiceInternalError,
+)
+
+__all__ = [
+    "AsyncBaseClient",
+    "BaseModel",
+    "Client",
+    "GraphQLClientError",
+    "GraphQLClientGraphQLError",
+    "GraphQLClientGraphQLMultiError",
+    "GraphQLClientHttpError",
+    "GraphQLClientInvalidResponseError",
+    "Item",
+    "ItemError",
+    "MyMutation",
+    "MyMutationChangeItem",
+    "MyMutationChangeItemContacts",
+    "MyMutationChangeItemErrorsItemServiceInternalError",
+    "Upload",
+]