Fixed an issue where defs are not included in the schema for msgspec.

Author: semohr

src/quart_schema/conversion.py

@@ -208,7 +208,11 @@ def model_schema(
         )
     elif _use_msgspec(model_class, preference):
         _, schema = schema_components([model_class], ref_template=MSGSPEC_REF_TEMPLATE)
-        return list(schema.values())[0]
+        schema_name = list(schema.keys())[0]
+        main_schema = schema.pop(schema_name)
+        if schema:  # Remaining schemas (like Attribute) become $defs
+            main_schema["$defs"] = schema
+        return main_schema
     elif not PYDANTIC_INSTALLED and not MSGSPEC_INSTALLED:
         raise TypeError(
             f"Cannot create schema for {model_class} - try installing msgspec or pydantic"

tests/test_conversion.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Any, TypedDict
+from typing import Any, Generic, TypedDict, TypeVar
 
 import pytest
 from attrs import define
@@ -132,6 +132,62 @@ def test_model_schema_msgspec(type_: TestType, preference: str) -> None:
     assert schema == expected
 
 
+A = TypeVar("A")
+M = TypeVar("M")
+
+
+class Modifier(TypedDict):
+    mod: int
+
+
+class Attribute(TypedDict):
+    title: str
+
+
+class Resource(TypedDict, Generic[A, M]):
+    foo: str
+    attribute: A
+    modifier: M
+
+
+def test_nested_generic_ref_included():
+    schema = model_schema(
+        Resource[Attribute, Modifier],
+        preference="msgspec",
+    )
+
+    assert schema == {
+        "title": "Resource[Attribute, Modifier]",
+        "type": "object",
+        "properties": {
+            "attribute": {
+                "$ref": "#/components/schemas/Attribute",
+            },
+            "modifier": {
+                "$ref": "#/components/schemas/Modifier",
+            },
+            "foo": {"type": "string"},
+        },
+        "required": ["attribute", "foo", "modifier"],
+        "$defs": {
+            "Attribute": {
+                "properties": {
+                    "title": {"type": "string"},
+                },
+                "required": ["title"],
+                "title": "Attribute",
+                "type": "object",
+            },
+            "Modifier": {
+                "properties": {"mod": {"type": "integer"}},
+                "required": ["mod"],
+                "title": "Modifier",
+                "type": "object",
+            },
+        },
+    }
+
+
 @define
 class AHeaders:
     x_info: str