properly recognize struct type

wkarwacki · Aug 20, 2024 · 6aa341a · 6aa341a
1 parent abf9063
commit 6aa341a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 34 deletions.
diff --git a/src/lib/open_api/schema.rs b/src/lib/open_api/schema.rs
@@ -290,43 +290,39 @@ impl Schema {
                         null: self.nullable,
                     }),
                     "object" => {
-                        if self.empty() {
-                            Def::Struct(Struct {})
-                        } else {
-                            self.additional_properties
-                                .clone()
-                                .map(|additional_properties| {
-                                    Def::Map(Box::new(Map {
-                                        key: Desc::Def(Def::Str(Str {
-                                            null: self.nullable,
-                                        })),
-                                        val: additional_properties.desc(name.clone(), context),
-                                        null: self.nullable,
-                                    }))
-                                })
-                                .unwrap_or({
-                                    let vars: HashMap<_, _> = self
-                                        .properties
-                                        .iter()
-                                        .map(|(n, schema)| {
-                                            (
-                                                n.clone(),
-                                                Box::new(Var {
-                                                    desc: schema.clone().desc(n.clone(), context),
-                                                    opt: !self.required.contains(n),
-                                                }),
-                                            )
-                                        })
-                                        .collect();
-                                    Def::Obj(Obj {
-                                        ext: None,
-                                        mix: Vec::new(),
-                                        vars: vars,
-                                        adt: self.adt(name.clone(), context),
+                        self.additional_properties
+                            .clone()
+                            .map(|additional_properties| {
+                                Def::Map(Box::new(Map {
+                                    key: Desc::Def(Def::Str(Str {
                                         null: self.nullable,
+                                    })),
+                                    val: additional_properties.desc(name.clone(), context),
+                                    null: self.nullable,
+                                }))
+                            })
+                            .unwrap_or({
+                                let vars: HashMap<_, _> = self
+                                    .properties
+                                    .iter()
+                                    .map(|(n, schema)| {
+                                        (
+                                            n.clone(),
+                                            Box::new(Var {
+                                                desc: schema.clone().desc(n.clone(), context),
+                                                opt: !self.required.contains(n),
+                                            }),
+                                        )
                                     })
+                                    .collect();
+                                Def::Obj(Obj {
+                                    ext: None,
+                                    mix: Vec::new(),
+                                    vars: vars,
+                                    adt: self.adt(name.clone(), context),
+                                    null: self.nullable,
                                 })
-                        }
+                            })
                     }
                     "string" => {
                         if self.r#enum.is_empty() {

diff --git a/src/lib/test/types-open-api.yml b/src/lib/test/types-open-api.yml
@@ -66,6 +66,9 @@ components:
           type: string
       required:
         - var
+    ObjEmpty:
+      type: object
+    Empty: {}
     SeqMapStrToDec:
       type: array
       items:

diff --git a/src/lib/test/types-trust.yml b/src/lib/test/types-trust.yml
@@ -25,6 +25,10 @@ defs:
     vars:
       var:
         type: str
+  ObjEmpty:
+    type: obj
+  Empty:
+    type: struct
   ObjWithSeq:
     type: obj
     vars: