prep _postprocess_django_query for potential API changes

Author: Archmonger

src/django_idom/hooks.py

@@ -120,15 +120,15 @@ def execute_query() -> None:
 
         try:
             # Run the initial query
-            query_options._data = query_options.func(*args, **kwargs)
+            data = query_options.func(*args, **kwargs)
 
             # Use a custom postprocessor, if provided
             if query_options.postprocessor:
                 query_options.postprocessor(query_options)
 
             # Use the default postprocessor
             else:
-                _postprocess_django_query(query_options)
+                _postprocess_django_query(data, query_options.postprocessor_options)
         except Exception as e:
             set_data(None)
             set_loading(False)
@@ -140,7 +140,7 @@ def execute_query() -> None:
         finally:
             set_should_execute(False)
 
-        set_data(query_options._data)
+        set_data(data)
         set_loading(False)
         set_error(None)
 
@@ -200,49 +200,35 @@ def reset() -> None:
     return Mutation(call, loading, error, reset)
 
 
-def _postprocess_django_query(fetch_cls: QueryOptions) -> None:
+def _postprocess_django_query(data: QuerySet | Model, options: dict[str, Any]) -> None:
     """Recursively fetch all fields within a `Model` or `QuerySet` to ensure they are not performed lazily.
 
     Some behaviors can be modified through `query_options` attributes."""
-    data = fetch_cls._data
 
-    # `QuerySet`, which is effectively a list of `Model` instances
+    # `QuerySet`, which is an iterable of `Model`/`QuerySet` instances
     # https://github.com/typeddjango/django-stubs/issues/704
     if isinstance(data, QuerySet):  # type: ignore[misc]
         for model in data:
-            _postprocess_django_query(
-                QueryOptions(
-                    func=fetch_cls.func,
-                    _data=model,
-                    postprocessor_options=fetch_cls.postprocessor_options,
-                )
-            )
+            _postprocess_django_query(model, options)
 
     # `Model` instances
     elif isinstance(data, Model):
-        prefetch_fields = []
+        prefetch_fields: list[str] = []
         for field in data._meta.get_fields():
             # `ForeignKey` relationships will cause an `AttributeError`
             # This is handled within the `ManyToOneRel` conditional below.
             with contextlib.suppress(AttributeError):
                 getattr(data, field.name)
 
-            if (
-                fetch_cls.postprocessor_options.get("many_to_one", None)
-                and type(field) == ManyToOneRel
-            ):
+            if options.get("many_to_one", None) and type(field) == ManyToOneRel:
                 prefetch_fields.append(f"{field.name}_set")
 
-            elif fetch_cls.postprocessor_options.get(
-                "many_to_many", None
-            ) and isinstance(field, ManyToManyField):
+            elif options.get("many_to_many", None) and isinstance(
+                field, ManyToManyField
+            ):
                 prefetch_fields.append(field.name)
                 _postprocess_django_query(
-                    QueryOptions(
-                        func=fetch_cls.func,
-                        _data=getattr(data, field.name).get_queryset(),
-                        postprocessor_options=fetch_cls.postprocessor_options,
-                    )
+                    getattr(data, field.name).get_queryset(), options
                 )
 
         if prefetch_fields:

src/django_idom/types.py

@@ -63,10 +63,6 @@ def __call__(self, *args, **kwargs):
     func: Callable
     """Callable that fetches ORM object(s)."""
 
-    _data: Any = None
-    """The results of a fetch operation.
-    This is only intended to be set automatically by the `use_query` hook."""
-
     postprocessor_options: dict[str, Any] = field(
         default_factory=lambda: {"many_to_many": False, "many_to_one": False}
     )