Add array and object to enum

Need to allow for whitespace

Author: Zantier

src/json_schema/mod.rs

@@ -580,10 +580,22 @@ mod tests {
                 r#"(0|1)"#,
                 vec!["0", "1"], vec!["a"],
             ),
+            // Enum array
+            (
+                r#"{"title": "Foo", "enum": [[1,2],[3,4]], "type": "array"}"#,
+                r#"(\[1,2\]|\[3,4\])"#,
+                vec!["[1,2]", "[3,4]"], vec!["1", "[1,3]"],
+            ),
+            // Enum object
+            (
+                r#"{"title": "Foo", "enum": [{"a":"b"}, {"c":"d"}], "type": "object"}"#,
+                r#"(\{"a":"b"\}|\{"c":"d"\})"#,
+                vec![r#"{"a":"b"}"#, r#"{"c":"d"}"#], vec!["a", r#"{"a":"c"}"#],
+            ),
             // Enum mix of types
             (
-                r#"{"title": "Foo", "enum": [6, 5.3, "potato", true, null]}"#,
-                r#"(6|5\.3|"potato"|true|null)"#,
+                r#"{"title": "Foo", "enum": [6, 5.3, "potato", true, null, [1,2], {"a":"b"}]}"#,
+                r#"(6|5\.3|"potato"|true|null|\[1,2\]|\{"a":"b"\})"#,
                 vec!["6", "5.3", r#""potato""#, "true", "null"], vec!["none", "53"],
             ),
             // ==========================================================

src/json_schema/parsing.rs

@@ -237,11 +237,15 @@ impl<'a> Parser<'a> {
                 let choices: Result<Vec<String>> = enum_values
                     .iter()
                     .map(|choice| match choice {
-                        Value::Null | Value::Bool(_) | Value::Number(_) | Value::String(_) => {
+                        Value::Null
+                        | Value::Bool(_)
+                        | Value::Number(_)
+                        | Value::String(_)
+                        | Value::Array(_)
+                        | Value::Object(_) => {
                             let json_string = serde_json::to_string(choice)?;
                             Ok(regex::escape(&json_string))
                         }
-                        _ => Err(Error::UnsupportedEnumDataType(Box::new(choice.clone()))),
                     })
                     .collect();