diff --git a/Cargo.toml b/Cargo.toml index 8b08f5be..0cc0b0b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" } [features] default = ["toml", "json", "yaml", "ini", "ron", "json5", "convert-case", "async"] json = ["serde_json"] -yaml = ["yaml-rust"] +yaml = ["serde_yaml"] ini = ["rust-ini"] json5 = ["json5_rs", "serde/derive"] convert-case = ["convert_case"] @@ -27,12 +27,13 @@ async = ["async-trait"] [dependencies] lazy_static = "1.0" serde = "1.0.8" +serde_with = "3" nom = "7" async-trait = { version = "0.1.50", optional = true } toml = { version = "0.8", optional = true } serde_json = { version = "1.0.2", optional = true } -yaml-rust = { version = "0.4", optional = true } +serde_yaml = { version = "0.9", optional = true } rust-ini = { version = "0.19", optional = true } ron = { version = "0.8", optional = true } json5_rs = { version = "0.4", optional = true, package = "json5" } diff --git a/README.md b/README.md index badab891..3130ef69 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ [JSON]: https://github.com/serde-rs/json [TOML]: https://github.com/toml-lang/toml -[YAML]: https://github.com/chyh1990/yaml-rust +[YAML]: https://github.com/dtolnay/serde-yaml [INI]: https://github.com/zonyitoo/rust-ini [RON]: https://github.com/ron-rs/ron [JSON5]: https://github.com/callum-oakley/json5-rs diff --git a/src/file/format/json.rs b/src/file/format/json.rs index bd506f0d..025219a0 100644 --- a/src/file/format/json.rs +++ b/src/file/format/json.rs @@ -2,53 +2,13 @@ use std::error::Error; use crate::format; use crate::map::Map; -use crate::value::{Value, ValueKind}; +use crate::value::Value; pub fn parse( uri: Option<&String>, text: &str, ) -> Result, Box> { - // Parse a JSON object value from the text - let value = from_json_value(uri, &serde_json::from_str(text)?); + // Parse a JSON input from the provided text + let value = format::from_parsed_value(uri, serde_json::from_str(text)?); format::extract_root_table(uri, value) } - -fn from_json_value(uri: Option<&String>, value: &serde_json::Value) -> Value { - match *value { - serde_json::Value::String(ref value) => Value::new(uri, ValueKind::String(value.clone())), - - serde_json::Value::Number(ref value) => { - if let Some(value) = value.as_i64() { - Value::new(uri, ValueKind::I64(value)) - } else if let Some(value) = value.as_f64() { - Value::new(uri, ValueKind::Float(value)) - } else { - unreachable!(); - } - } - - serde_json::Value::Bool(value) => Value::new(uri, ValueKind::Boolean(value)), - - serde_json::Value::Object(ref table) => { - let mut m = Map::new(); - - for (key, value) in table { - m.insert(key.clone(), from_json_value(uri, value)); - } - - Value::new(uri, ValueKind::Table(m)) - } - - serde_json::Value::Array(ref array) => { - let mut l = Vec::new(); - - for value in array { - l.push(from_json_value(uri, value)); - } - - Value::new(uri, ValueKind::Array(l)) - } - - serde_json::Value::Null => Value::new(uri, ValueKind::Nil), - } -} diff --git a/src/file/format/json5.rs b/src/file/format/json5.rs index 99003bd0..242a4725 100644 --- a/src/file/format/json5.rs +++ b/src/file/format/json5.rs @@ -2,53 +2,13 @@ use std::error::Error; use crate::format; use crate::map::Map; -use crate::value::{Value, ValueKind}; - -#[derive(serde::Deserialize, Debug)] -#[serde(untagged)] -pub enum Val { - Null, - Boolean(bool), - Integer(i64), - Float(f64), - String(String), - Array(Vec), - Object(Map), -} +use crate::value::Value; pub fn parse( uri: Option<&String>, text: &str, ) -> Result, Box> { - let value = from_json5_value(uri, json5_rs::from_str::(text)?); + // Parse a JSON5 input from the provided text + let value = format::from_parsed_value(uri, json5_rs::from_str(text)?); format::extract_root_table(uri, value) } - -fn from_json5_value(uri: Option<&String>, value: Val) -> Value { - let vk = match value { - Val::Null => ValueKind::Nil, - Val::String(v) => ValueKind::String(v), - Val::Integer(v) => ValueKind::I64(v), - Val::Float(v) => ValueKind::Float(v), - Val::Boolean(v) => ValueKind::Boolean(v), - Val::Object(table) => { - let m = table - .into_iter() - .map(|(k, v)| (k, from_json5_value(uri, v))) - .collect(); - - ValueKind::Table(m) - } - - Val::Array(array) => { - let l = array - .into_iter() - .map(|v| from_json5_value(uri, v)) - .collect(); - - ValueKind::Array(l) - } - }; - - Value::new(uri, vk) -} diff --git a/src/file/format/mod.rs b/src/file/format/mod.rs index 025e98a9..b292f68c 100644 --- a/src/file/format/mod.rs +++ b/src/file/format/mod.rs @@ -40,7 +40,7 @@ pub enum FileFormat { #[cfg(feature = "json")] Json, - /// YAML (parsed with yaml_rust) + /// YAML (parsed with serde_yaml) #[cfg(feature = "yaml")] Yaml, diff --git a/src/file/format/ron.rs b/src/file/format/ron.rs index 9ac81a9d..67b19f57 100644 --- a/src/file/format/ron.rs +++ b/src/file/format/ron.rs @@ -2,62 +2,12 @@ use std::error::Error; use crate::format; use crate::map::Map; -use crate::value::{Value, ValueKind}; +use crate::value::Value; pub fn parse( uri: Option<&String>, text: &str, ) -> Result, Box> { - let value = from_ron_value(uri, ron::from_str(text)?)?; + let value = format::from_parsed_value(uri, ron::from_str(text)?); format::extract_root_table(uri, value) } - -fn from_ron_value( - uri: Option<&String>, - value: ron::Value, -) -> Result> { - let kind = match value { - ron::Value::Option(value) => match value { - Some(value) => from_ron_value(uri, *value)?.kind, - None => ValueKind::Nil, - }, - - ron::Value::Unit => ValueKind::Nil, - - ron::Value::Bool(value) => ValueKind::Boolean(value), - - ron::Value::Number(value) => match value { - ron::Number::Float(value) => ValueKind::Float(value.get()), - ron::Number::Integer(value) => ValueKind::I64(value), - }, - - ron::Value::Char(value) => ValueKind::String(value.to_string()), - - ron::Value::String(value) => ValueKind::String(value), - - ron::Value::Seq(values) => { - let array = values - .into_iter() - .map(|value| from_ron_value(uri, value)) - .collect::, _>>()?; - - ValueKind::Array(array) - } - - ron::Value::Map(values) => { - let map = values - .iter() - .map(|(key, value)| -> Result<_, Box> { - let key = key.clone().into_rust::()?; - let value = from_ron_value(uri, value.clone())?; - - Ok((key, value)) - }) - .collect::, _>>()?; - - ValueKind::Table(map) - } - }; - - Ok(Value::new(uri, kind)) -} diff --git a/src/file/format/toml.rs b/src/file/format/toml.rs index 19b78044..55931698 100644 --- a/src/file/format/toml.rs +++ b/src/file/format/toml.rs @@ -8,38 +8,7 @@ pub fn parse( uri: Option<&String>, text: &str, ) -> Result, Box> { - // Parse a TOML value from the provided text - let value = from_toml_value(uri, &toml::from_str(text)?); + // Parse a TOML input from the provided text + let value = format::from_parsed_value(uri, toml::from_str(text)?); format::extract_root_table(uri, value) } - -fn from_toml_value(uri: Option<&String>, value: &toml::Value) -> Value { - match *value { - toml::Value::String(ref value) => Value::new(uri, value.to_string()), - toml::Value::Float(value) => Value::new(uri, value), - toml::Value::Integer(value) => Value::new(uri, value), - toml::Value::Boolean(value) => Value::new(uri, value), - - toml::Value::Table(ref table) => { - let mut m = Map::new(); - - for (key, value) in table { - m.insert(key.clone(), from_toml_value(uri, value)); - } - - Value::new(uri, m) - } - - toml::Value::Array(ref array) => { - let mut l = Vec::new(); - - for value in array { - l.push(from_toml_value(uri, value)); - } - - Value::new(uri, l) - } - - toml::Value::Datetime(ref datetime) => Value::new(uri, datetime.to_string()), - } -} diff --git a/src/file/format/yaml.rs b/src/file/format/yaml.rs index b35ba4d9..e04c5dfd 100644 --- a/src/file/format/yaml.rs +++ b/src/file/format/yaml.rs @@ -1,105 +1,14 @@ use std::error::Error; -use std::fmt; -use std::mem; - -use yaml_rust as yaml; use crate::format; use crate::map::Map; -use crate::value::{Value, ValueKind}; +use crate::value::Value; pub fn parse( uri: Option<&String>, text: &str, ) -> Result, Box> { - // Parse a YAML object from file - let mut docs = yaml::YamlLoader::load_from_str(text)?; - let root = match docs.len() { - 0 => yaml::Yaml::Hash(yaml::yaml::Hash::new()), - 1 => mem::replace(&mut docs[0], yaml::Yaml::Null), - n => { - return Err(Box::new(MultipleDocumentsError(n))); - } - }; - - let value = from_yaml_value(uri, &root)?; + // Parse a YAML input from the provided text + let value = format::from_parsed_value(uri, serde_yaml::from_str(text)?); format::extract_root_table(uri, value) } - -fn from_yaml_value( - uri: Option<&String>, - value: &yaml::Yaml, -) -> Result> { - match *value { - yaml::Yaml::String(ref value) => Ok(Value::new(uri, ValueKind::String(value.clone()))), - yaml::Yaml::Real(ref value) => { - // TODO: Figure out in what cases this can panic? - value - .parse::() - .map_err(|_| { - Box::new(FloatParsingError(value.to_string())) as Box<(dyn Error + Send + Sync)> - }) - .map(ValueKind::Float) - .map(|f| Value::new(uri, f)) - } - yaml::Yaml::Integer(value) => Ok(Value::new(uri, ValueKind::I64(value))), - yaml::Yaml::Boolean(value) => Ok(Value::new(uri, ValueKind::Boolean(value))), - yaml::Yaml::Hash(ref table) => { - let mut m = Map::new(); - for (key, value) in table { - match key { - yaml::Yaml::String(k) => m.insert(k.to_owned(), from_yaml_value(uri, value)?), - yaml::Yaml::Integer(k) => m.insert(k.to_string(), from_yaml_value(uri, value)?), - _ => unreachable!(), - }; - } - Ok(Value::new(uri, ValueKind::Table(m))) - } - yaml::Yaml::Array(ref array) => { - let mut l = Vec::new(); - - for value in array { - l.push(from_yaml_value(uri, value)?); - } - - Ok(Value::new(uri, ValueKind::Array(l))) - } - - // 1. Yaml NULL - // 2. BadValue – It shouldn't be possible to hit BadValue as this only happens when - // using the index trait badly or on a type error but we send back nil. - // 3. Alias – No idea what to do with this and there is a note in the lib that its - // not fully supported yet anyway - _ => Ok(Value::new(uri, ValueKind::Nil)), - } -} - -#[derive(Debug, Copy, Clone)] -struct MultipleDocumentsError(usize); - -impl fmt::Display for MultipleDocumentsError { - fn fmt(&self, format: &mut fmt::Formatter) -> fmt::Result { - write!(format, "Got {} YAML documents, expected 1", self.0) - } -} - -impl Error for MultipleDocumentsError { - fn description(&self) -> &str { - "More than one YAML document provided" - } -} - -#[derive(Debug, Clone)] -struct FloatParsingError(String); - -impl fmt::Display for FloatParsingError { - fn fmt(&self, format: &mut fmt::Formatter) -> fmt::Result { - write!(format, "Parsing {} as floating point number failed", self.0) - } -} - -impl Error for FloatParsingError { - fn description(&self) -> &str { - "Floating point number parsing failed" - } -} diff --git a/src/format.rs b/src/format.rs index 3d1ca335..3c0b4757 100644 --- a/src/format.rs +++ b/src/format.rs @@ -3,6 +3,8 @@ use std::error::Error; use crate::error::{ConfigError, Unexpected}; use crate::map::Map; use crate::value::{Value, ValueKind}; +use serde::Deserialize; +use serde_with::rust::deserialize_ignore_any; /// Describes a format of configuration source data /// @@ -44,3 +46,129 @@ pub fn extract_root_table( .map_err(|err| ConfigError::invalid_root(uri, err)) .map_err(|err| Box::new(err) as Box) } + +// Equivalent to ValueKind, except Table + Array store the same enum +// Useful for serde to serialize values into, then convert to Value. +// NOTE: Order of variants is important. Serde will use whichever +// the input successfully deserializes into first. +#[derive(serde::Deserialize, Debug)] +#[serde(untagged)] +pub enum ParsedValue { + Boolean(bool), + I64(i64), + I128(i128), + U64(u64), + U128(u128), + Float(f64), + #[serde(deserialize_with = "deserialize_parsed_string")] + String(String), + #[serde(deserialize_with = "deserialize_parsed_map")] + Table(Map), + Array(Vec), + Option(Option>), + // If nothing else above matched, use Nil: + #[serde(deserialize_with = "deserialize_ignore_any")] + Nil, +} + +// Value wrap ValueKind values, with optional uri (origin) +pub fn from_parsed_value(uri: Option<&String>, value: ParsedValue) -> Value { + let vk = match value { + ParsedValue::Nil => ValueKind::Nil, + ParsedValue::String(v) => ValueKind::String(v), + ParsedValue::I64(v) => ValueKind::I64(v), + ParsedValue::I128(v) => ValueKind::I128(v), + ParsedValue::U64(v) => ValueKind::U64(v), + ParsedValue::U128(v) => ValueKind::U128(v), + ParsedValue::Float(v) => ValueKind::Float(v), + ParsedValue::Boolean(v) => ValueKind::Boolean(v), + + ParsedValue::Table(table) => { + let m = table + .into_iter() + .map(|(k, v)| (k, from_parsed_value(uri, v))) + .collect(); + + ValueKind::Table(m) + } + + ParsedValue::Array(array) => { + let l = array + .into_iter() + .map(|v| from_parsed_value(uri, v)) + .collect(); + + ValueKind::Array(l) + } + + // Boxed value must be dereferenced: + ParsedValue::Option(v) => match v { + Some(boxed) => from_parsed_value(uri, *boxed).kind, + None => ValueKind::Nil, + }, + }; + + Value::new(uri, vk) +} + +fn deserialize_parsed_string<'de, D>(deserializer: D) -> Result +where + D: serde::de::Deserializer<'de>, +{ + #[derive(serde::Deserialize)] + #[serde(untagged)] + enum ParsedString { + // Anything that can deserialize into a string successfully: + String(String), + // Config specific support for types that need string conversion: + Char(char), + #[cfg(feature = "toml")] + TomlDateTime(toml::value::Datetime), + } + + match ParsedString::deserialize(deserializer)? { + ParsedString::String(v) => Ok(v), + ParsedString::Char(v) => Ok(v.to_string()), + #[cfg(feature = "toml")] + ParsedString::TomlDateTime(v) => Ok(v.to_string()), + } +} + +fn deserialize_parsed_map<'de, D>(deserializer: D) -> Result, D::Error> +where + D: serde::de::Deserializer<'de>, +{ + #[derive(serde::Deserialize)] + #[serde(untagged)] + enum ParsedMap { + // Anything that can deserialize into a Map successfully: + Table(Map), + // Config specific support for types that need string conversion: + #[cfg(feature = "yaml")] + YamlMap(serde_yaml::Mapping), + } + + match ParsedMap::deserialize(deserializer)? { + ParsedMap::Table(v) => Ok(v), + #[cfg(feature = "yaml")] + ParsedMap::YamlMap(table) => { + table + .into_iter() + .map(|(key, value)| { + let key = match key { + serde_yaml::Value::Number(k) => Some(k.to_string()), + serde_yaml::Value::String(k) => Some(k), + _ => None, + }; + let value = serde_yaml::from_value::(value).ok(); + + // Option to Result: + match (key, value) { + (Some(k), Some(v)) => Ok((k, v)), + _ => Err(serde::de::Error::custom("should not be serialized to Map")), + } + }) + .collect() + } + } +} diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs index b961c2a6..a506614f 100644 --- a/tests/file_yaml.rs +++ b/tests/file_yaml.rs @@ -81,12 +81,13 @@ fn test_error_parse() { let path_with_extension: PathBuf = ["tests", "Settings-invalid.yaml"].iter().collect(); + // Should fail to parse block mapping as no `:` exists to identify a key assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), format!( - "while parsing a block mapping, did not find expected key at \ - line 2 column 1 in {}", + "could not find expected ':' at line 3 column 1, \ + while scanning a simple key at line 2 column 1 in {}", path_with_extension.display() ) ); diff --git a/tests/legacy/file_yaml.rs b/tests/legacy/file_yaml.rs index 21d41384..844a7aa0 100644 --- a/tests/legacy/file_yaml.rs +++ b/tests/legacy/file_yaml.rs @@ -81,12 +81,13 @@ fn test_error_parse() { let path_with_extension: PathBuf = ["tests", "Settings-invalid.yaml"].iter().collect(); + // Should fail to parse block mapping as no `:` exists to identify a key assert!(res.is_err()); assert_eq!( res.unwrap_err().to_string(), format!( - "while parsing a block mapping, did not find expected key at \ - line 2 column 1 in {}", + "could not find expected ':' at line 3 column 1, \ + while scanning a simple key at line 2 column 1 in {}", path_with_extension.display() ) );