feat: add support for graphql-core 3.3.x

Author: bellini666

.github/workflows/tests.yml

@@ -53,6 +53,9 @@ jobs:
         mode:
           - std
           - geos
+        gql-core:
+          - '3.2'
+          - '3.3'
         exclude:
           # Django 4.2 only supports python 3.8-3.12
           - django-version: 4.2.*
@@ -89,6 +92,13 @@ jobs:
         run: uv sync
       - name: Install Django ${{ matrix.django-version }}
         run: uv pip install "django==${{ matrix.django-version }}"
+      - name: Install graphql-core ${{ matrix.gql-core }}
+        run: |
+          if [ "${{ matrix.gql-core }}" = "3.2" ]; then
+            uv pip install "graphql-core>=3.2.0,<3.3.0"
+          else
+            uv pip install "graphql-core>=3.3.0a11"
+          fi
       - name: Test with pytest
         run: uv run --no-sync pytest -n auto --showlocals -vvv --cov-report=xml
       - name: Upload coverage to Codecov

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
       - id: check-xml
       - id: check-symlinks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.11
+    rev: v0.14.13
     hooks:
       - id: ruff-format
       - id: ruff

strawberry_django/optimizer.py

@@ -33,7 +33,6 @@
     GraphQLWrappingType,
     get_argument_values,
 )
-from graphql.execution.collect_fields import collect_sub_fields
 from graphql.language.ast import OperationType
 from graphql.type.definition import GraphQLResolveInfo, get_named_type
 from strawberry import UNSET, relay
@@ -54,6 +53,7 @@
 from strawberry_django.resolvers import django_fetch
 
 from .descriptors import ModelProperty
+from .utils.gql_compat import get_sub_field_selections
 from .utils.inspect import (
     PrefetchInspector,
     get_model_field,
@@ -645,13 +645,7 @@ def _get_selections(
     info: GraphQLResolveInfo,
     parent_type: GraphQLObjectType | GraphQLInterfaceType,
 ) -> dict[str, list[FieldNode]]:
-    return collect_sub_fields(
-        info.schema,
-        info.fragments,
-        info.variable_values,
-        cast("GraphQLObjectType", parent_type),
-        info.field_nodes,
-    )
+    return get_sub_field_selections(info, parent_type)
 
 
 def _generate_selection_resolve_info(

strawberry_django/utils/__init__.py

@@ -0,0 +1,3 @@
+from strawberry_django.utils.gql_compat import IS_GQL_32, IS_GQL_33
+
+__all__ = ["IS_GQL_32", "IS_GQL_33"]

strawberry_django/utils/gql_compat.py

@@ -0,0 +1,73 @@
+"""Compatibility layer for graphql-core 3.2.x and 3.3.x."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, cast
+
+from graphql import (
+    FieldNode,
+    GraphQLInterfaceType,
+    GraphQLObjectType,
+)
+from graphql.version import VersionInfo, version_info
+
+if TYPE_CHECKING:
+    from graphql.type.definition import GraphQLResolveInfo
+
+IS_GQL_33 = version_info >= VersionInfo.from_str("3.3.0a0")
+IS_GQL_32 = not IS_GQL_33
+
+
+def get_sub_field_selections(
+    info: GraphQLResolveInfo,
+    parent_type: GraphQLObjectType | GraphQLInterfaceType,
+) -> dict[str, list[FieldNode]]:
+    """Collect sub-fields, handling API differences between 3.2.x and 3.3.x."""
+    if IS_GQL_32:
+        return _get_selections_gql32(info, parent_type)
+    return _get_selections_gql33(info, parent_type)
+
+
+def _get_selections_gql32(
+    info: GraphQLResolveInfo,
+    parent_type: GraphQLObjectType | GraphQLInterfaceType,
+) -> dict[str, list[FieldNode]]:
+    from graphql.execution.collect_fields import (
+        collect_sub_fields,
+    )
+
+    return collect_sub_fields(
+        info.schema,
+        info.fragments,
+        info.variable_values,
+        cast("GraphQLObjectType", parent_type),
+        info.field_nodes,
+    )
+
+
+def _get_selections_gql33(
+    info: GraphQLResolveInfo,
+    parent_type: GraphQLObjectType | GraphQLInterfaceType,
+) -> dict[str, list[FieldNode]]:
+    from graphql.execution.collect_fields import (
+        FieldDetails,  # type: ignore
+        collect_subfields,  # type: ignore
+    )
+
+    field_group: list[Any] = [
+        FieldDetails(node=fn, defer_usage=None) for fn in info.field_nodes
+    ]
+
+    collected = collect_subfields(
+        info.schema,
+        info.fragments,
+        info.variable_values,
+        info.operation,
+        cast("GraphQLObjectType", parent_type),
+        field_group,
+    )
+
+    return {
+        key: [fd.node for fd in field_details]
+        for key, field_details in collected.grouped_field_set.items()
+    }

tests/conftest.py

@@ -10,10 +10,26 @@
 
 import strawberry_django
 from strawberry_django.optimizer import DjangoOptimizerExtension
+from strawberry_django.utils import IS_GQL_32, IS_GQL_33
 from tests.utils import GraphQLTestClient
 
 from . import models, types, utils
 
+
+def skip_if_gql_32(
+    reason: str = "Test requires graphql-core 3.3+",
+) -> pytest.MarkDecorator:
+    """Skip test if running with graphql-core 3.2.x."""
+    return pytest.mark.skipif(IS_GQL_32, reason=reason)
+
+
+def skip_if_gql_33(
+    reason: str = "Test requires graphql-core 3.2.x",
+) -> pytest.MarkDecorator:
+    """Skip test if running with graphql-core 3.3+."""
+    return pytest.mark.skipif(IS_GQL_33, reason=reason)
+
+
 _TESTS_DIR = pathlib.Path(__file__).parent
 _ROOT_DIR = _TESTS_DIR.parent