Merge pull request #124 from syastrov/bugfix/123/schema-with-multiple…

…-unions Bugfix: schema generation outputted references rather than primitives
seandstewart · Aug 10, 2020 · 45557bb · 45557bb
2 parents a7379b8 + c3bf776
commit 45557bb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/tests/objects.py b/tests/objects.py
@@ -119,6 +119,13 @@ class G:
     h: typing.Optional[int] = None
 
 
+@dataclasses.dataclass
+class ThreeOptionals:
+    a: typing.Optional[str]
+    b: typing.Optional[str] = None
+    c: typing.Optional[str] = None
+
+
 class Class:
     var: str
 

diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -218,6 +218,30 @@ class Container:
                 definitions=typic.FrozenDict(),
             ),
         ),
+        (
+            objects.ThreeOptionals,
+            typic.ObjectSchemaField(
+                title=objects.ThreeOptionals.__name__,
+                description=objects.ThreeOptionals.__doc__,
+                properties=typic.FrozenDict(
+                    a=typic.MultiSchemaField(
+                        title="A",
+                        anyOf=(typic.StrSchemaField(), typic.NullSchemaField()),
+                    ),
+                    b=typic.MultiSchemaField(
+                        title="B",
+                        anyOf=(typic.StrSchemaField(), typic.NullSchemaField()),
+                    ),
+                    c=typic.MultiSchemaField(
+                        title="C",
+                        anyOf=(typic.StrSchemaField(), typic.NullSchemaField()),
+                    ),
+                ),
+                required=("a",),
+                additionalProperties=False,
+                definitions=typic.FrozenDict(),
+            ),
+        ),
         (
             objects.A,
             typic.ObjectSchemaField(

diff --git a/typic/ext/schema/schema.py b/typic/ext/schema/schema.py
@@ -148,7 +148,6 @@ def get_field(
         if protocol.annotation in self.__stack:
             name = self.defname(protocol.annotation.resolved_origin, name)
             return Ref(f"#/definitions/{name}")
-        self.__stack.add(protocol.annotation)
         anno = protocol.annotation
         if anno in self.__cache:
             return self.__cache[anno]
@@ -188,6 +187,8 @@ def get_field(
             self.__cache[anno] = schema
             return schema
 
+        self.__stack.add(anno)
+
         # Check if this should be ro/wo
         if use in {ReadOnly, WriteOnly, Final}:
             ro = (use in {ReadOnly, Final}) or None