fix: Fix an issue preventing typing root with strawberry.Parent

RELEASE.md

@@ -0,0 +1,17 @@
+Release type: patch
+
+This release fixes a typing issue where trying to type a `root` argument with
+`strawberry.Parent` would fail, like in the following example:
+
+```python
+import strawberry
+
+
+@strawberry.type
+class SomeType:
+    @strawberry.field
+    def hello(self, root: strawberry.Parent[str]) -> str:
+        return "world"
+```
+
+This should now work as intended.

strawberry/types/fields/resolver.py

@@ -231,30 +231,25 @@ def reserved_parameters(
     @cached_property
     def arguments(self) -> List[StrawberryArgument]:
         """Resolver arguments exposed in the GraphQL Schema."""
-        parameters = self.signature.parameters.values()
-        reserved_parameters = set(self.reserved_parameters.values())
-        populated_reserved_parameters = set(
-            key for key, value in self.reserved_parameters.items() if value is not None
-        )
+        root_parameter = self.reserved_parameters.get(ROOT_PARAMSPEC)
+        parent_parameter = self.reserved_parameters.get(PARENT_PARAMSPEC)
 
+        # TODO: Maybe use SELF_PARAMSPEC in the future? Right now
+        # it would prevent some common pattern for integrations
+        # (e.g. django) of typing the `root` parameters as the
+        # type of the real object being used
         if (
-            conflicting_arguments := (
-                populated_reserved_parameters
-                # TODO: Maybe use SELF_PARAMSPEC in the future? Right now
-                # it would prevent some common pattern for integrations
-                # (e.g. django) of typing the `root` parameters as the
-                # type of the real object being used
-                & {ROOT_PARAMSPEC, PARENT_PARAMSPEC}
-            )
-        ) and len(conflicting_arguments) > 1:
+            root_parameter is not None
+            and parent_parameter is not None
+            and root_parameter.name != parent_parameter.name
+        ):
             raise ConflictingArgumentsError(
                 self,
-                [
-                    cast(Parameter, self.reserved_parameters[key]).name
-                    for key in conflicting_arguments
-                ],
+                [root_parameter.name, parent_parameter.name],
             )
 
+        parameters = self.signature.parameters.values()
+        reserved_parameters = set(self.reserved_parameters.values())
         missing_annotations: List[str] = []
         arguments: List[StrawberryArgument] = []
         user_parameters = (p for p in parameters if p not in reserved_parameters)

tests/fields/test_resolvers.py

@@ -1,6 +1,7 @@
 import dataclasses
+import textwrap
 import types
-from typing import ClassVar, List, no_type_check
+from typing import Any, ClassVar, List, no_type_check
 
 import pytest
 
@@ -453,3 +454,83 @@ def bar(x: str = "bar"):
 
     assert len(parameters_map) == 2
     assert len(parameters_set) == 2
+
+
+def test_annotation_using_parent_annotation():
+    @strawberry.type
+    class FruitType:
+        name: str
+
+        @strawberry.field
+        @staticmethod
+        def name_from_parent(parent: strawberry.Parent[Any]) -> str:
+            return f"Using 'parent': {parent.name}"
+
+    @strawberry.type
+    class Query:
+        @strawberry.field
+        @staticmethod
+        def fruit() -> FruitType:
+            return FruitType(name="Strawberry")
+
+    schema = strawberry.Schema(query=Query)
+    expected = """\
+      type FruitType {
+        name: String!
+        nameFromParent: String!
+      }
+
+      type Query {
+        fruit: FruitType!
+      }
+    """
+
+    assert textwrap.dedent(str(schema)) == textwrap.dedent(expected).strip()
+
+    result = schema.execute_sync("query { fruit { name nameFromParent } }")
+    assert result.data == {
+        "fruit": {
+            "name": "Strawberry",
+            "nameFromParent": "Using 'parent': Strawberry",
+        }
+    }
+
+
+def test_annotation_using_parent_annotation_but_named_root():
+    @strawberry.type
+    class FruitType:
+        name: str
+
+        @strawberry.field
+        @staticmethod
+        def name_from_parent(root: strawberry.Parent[Any]) -> str:
+            return f"Using 'root': {root.name}"
+
+    @strawberry.type
+    class Query:
+        @strawberry.field
+        @staticmethod
+        def fruit() -> FruitType:
+            return FruitType(name="Strawberry")
+
+    schema = strawberry.Schema(query=Query)
+    expected = """\
+      type FruitType {
+        name: String!
+        nameFromParent: String!
+      }
+
+      type Query {
+        fruit: FruitType!
+      }
+    """
+
+    assert textwrap.dedent(str(schema)) == textwrap.dedent(expected).strip()
+
+    result = schema.execute_sync("query { fruit { name nameFromParent } }")
+    assert result.data == {
+        "fruit": {
+            "name": "Strawberry",
+            "nameFromParent": "Using 'root': Strawberry",
+        }
+    }