fix missing type

FAIRChemistry · Dec 12, 2024 · 55e9036 · 55e9036
1 parent a8ebda4
commit 55e9036
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/json/export.rs b/src/json/export.rs
@@ -336,7 +336,7 @@ impl TryFrom<&Attribute> for schema::Property {
         let description = (!attr.docstring.is_empty()).then(|| attr.docstring.clone());
         let enum_values = if attr.is_enum { Some(Vec::new()) } else { None };
 
-        if attr.dtypes.len() > 1 {
+        if attr.dtypes.len() > 1 && !attr.is_array {
             // If there are multiple types, we need to use the AnyOf case
             dtype = None;
         }
@@ -489,7 +489,7 @@ mod tests {
 
         let expected_json = json!({
             "title": "test_attribute",
-            "anyOf": [
+            "oneOf": [
                 {"type": "string"},
                 {"$ref": "#/$defs/RefType"},
             ]
@@ -523,7 +523,7 @@ mod tests {
             "title": "test_attribute",
             "type": "array",
             "items": {
-                "anyOf": [
+                "oneOf": [
                     {"type": "string"},
                     {"$ref": "#/$defs/RefType"}
                 ]

diff --git a/tests/data/expected_json_schema.json b/tests/data/expected_json_schema.json
@@ -25,6 +25,7 @@
     },
     "multiple_types_array": {
       "title": "multiple_types_array",
+      "type": "array",
       "items": {
         "oneOf": [
           {