Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 25 additions & 15 deletions lib/codegen/fromcto/rust/rustvisitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -521,18 +521,23 @@ class RustVisitor {
parameters.fileWriter.writeLine(1, '#[serde(');
parameters.fileWriter.writeLine(2, `rename = "${field.name}",`);

// DateTime keys and values use the custom (de)serializers in utils.rs
const isKeyDateTime = this.isDateField(mapKeyType);
const isValueDateTime = this.isDateField(mapValueType);

// Add skip_serializing_if for optional HashMap fields
if (field.isOptional?.()) {
parameters.fileWriter.writeLine(
2,
'skip_serializing_if = "Option::is_none",'
);
if (isKeyDateTime || isValueDateTime) {
// serde only treats a missing Option field as None when it
// deserializes the field itself, not with deserialize_with
parameters.fileWriter.writeLine(2, 'default,');
}
}

// Add custom serializers for DateTime keys/values in HashMap
const isKeyDateTime = this.isDateField(mapKeyType);
const isValueDateTime = this.isDateField(mapValueType);

if (isKeyDateTime && isValueDateTime) {
// Both key and value are DateTime
if (field.isOptional?.()) {
Expand Down Expand Up @@ -621,6 +626,11 @@ class RustVisitor {
2,
'skip_serializing_if = "Option::is_none",'
);
if (this.isDateField(field.type)) {
// serde only treats a missing Option field as None when it
// deserializes the field itself, not with deserialize_with
parameters.fileWriter.writeLine(2, 'default,');
}
type = this.wrapAsOption(type);
}
if (this.isDateField(field.type)) {
Expand Down Expand Up @@ -908,7 +918,7 @@ class RustVisitor {
);
parameters.fileWriter.writeLine(
1,
'DateTime::parse_from_str(&datetime_str, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)'
'DateTime::parse_from_rfc3339(&datetime_str).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)'
);
parameters.fileWriter.writeLine(0, '}');
parameters.fileWriter.writeLine(1, '');
Expand Down Expand Up @@ -970,7 +980,7 @@ class RustVisitor {
parameters.fileWriter.writeLine(2, '.iter()');
parameters.fileWriter.writeLine(
2,
'.map(|s| DateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))'
'.map(|s| DateTime::parse_from_rfc3339(s).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))'
);
parameters.fileWriter.writeLine(2, '.collect()');
parameters.fileWriter.writeLine(0, '}');
Expand Down Expand Up @@ -1017,7 +1027,7 @@ class RustVisitor {
parameters.fileWriter.writeLine(4, '.iter()');
parameters.fileWriter.writeLine(
4,
'.map(|s| DateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))'
'.map(|s| DateTime::parse_from_rfc3339(s).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))'
);
parameters.fileWriter.writeLine(4, '.collect();');
parameters.fileWriter.writeLine(3, 'result.map(Some)');
Expand Down Expand Up @@ -1067,7 +1077,7 @@ class RustVisitor {
parameters.fileWriter.writeLine(1, 'for (k, v) in string_map {');
parameters.fileWriter.writeLine(
2,
'let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(2, 'result.insert(datetime_key, v);');
parameters.fileWriter.writeLine(1, '}');
Expand Down Expand Up @@ -1114,7 +1124,7 @@ class RustVisitor {
parameters.fileWriter.writeLine(1, 'for (k, v) in string_map {');
parameters.fileWriter.writeLine(
2,
'let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(2, 'result.insert(k, datetime_value);');
parameters.fileWriter.writeLine(1, '}');
Expand Down Expand Up @@ -1161,11 +1171,11 @@ class RustVisitor {
parameters.fileWriter.writeLine(1, 'for (k, v) in string_map {');
parameters.fileWriter.writeLine(
2,
'let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(
2,
'let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(
2,
Expand Down Expand Up @@ -1216,7 +1226,7 @@ class RustVisitor {
parameters.fileWriter.writeLine(3, 'for (k, v) in string_map {');
parameters.fileWriter.writeLine(
4,
'let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(4, 'result.insert(datetime_key, v);');
parameters.fileWriter.writeLine(3, '}');
Expand Down Expand Up @@ -1266,7 +1276,7 @@ class RustVisitor {
parameters.fileWriter.writeLine(3, 'for (k, v) in string_map {');
parameters.fileWriter.writeLine(
4,
'let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(4, 'result.insert(k, datetime_value);');
parameters.fileWriter.writeLine(3, '}');
Expand Down Expand Up @@ -1316,11 +1326,11 @@ class RustVisitor {
parameters.fileWriter.writeLine(3, 'for (k, v) in string_map {');
parameters.fileWriter.writeLine(
4,
'let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(
4,
'let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
'let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;'
);
parameters.fileWriter.writeLine(
4,
Expand Down
22 changes: 11 additions & 11 deletions test/codegen/__snapshots__/codegen.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5701,7 +5701,7 @@ where
D: Deserializer<'de>,
{
let datetime_str = String::deserialize(deserializer)?;
DateTime::parse_from_str(&datetime_str, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)
DateTime::parse_from_rfc3339(&datetime_str).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)
}

pub fn serialize_datetime<S>(datetime: &chrono::DateTime<Utc>, serializer: S) -> Result<S::Ok, S::Error>
Expand Down Expand Up @@ -5730,7 +5730,7 @@ where
let datetime_strings = Vec::<String>::deserialize(deserializer)?;
datetime_strings
.iter()
.map(|s| DateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))
.map(|s| DateTime::parse_from_rfc3339(s).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))
.collect()
}

Expand All @@ -5754,7 +5754,7 @@ where
Some(datetime_strings) => {
let result: Result<Vec<_>, _> = datetime_strings
.iter()
.map(|s| DateTime::parse_from_str(s, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))
.map(|s| DateTime::parse_from_rfc3339(s).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom))
.collect();
result.map(Some)
},
Expand All @@ -5780,7 +5780,7 @@ where
let string_map = std::collections::HashMap::<String, String>::deserialize(deserializer)?;
let mut result = std::collections::HashMap::new();
for (k, v) in string_map {
let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
result.insert(datetime_key, v);
}
Ok(result)
Expand All @@ -5804,7 +5804,7 @@ where
let string_map = std::collections::HashMap::<String, String>::deserialize(deserializer)?;
let mut result = std::collections::HashMap::new();
for (k, v) in string_map {
let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
result.insert(k, datetime_value);
}
Ok(result)
Expand All @@ -5828,8 +5828,8 @@ where
let string_map = std::collections::HashMap::<String, String>::deserialize(deserializer)?;
let mut result = std::collections::HashMap::new();
for (k, v) in string_map {
let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
result.insert(datetime_key, datetime_value);
}
Ok(result)
Expand All @@ -5853,7 +5853,7 @@ where
Some(string_map) => {
let mut result = std::collections::HashMap::new();
for (k, v) in string_map {
let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
result.insert(datetime_key, v);
}
Ok(Some(result))
Expand All @@ -5880,7 +5880,7 @@ where
Some(string_map) => {
let mut result = std::collections::HashMap::new();
for (k, v) in string_map {
let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
result.insert(k, datetime_value);
}
Ok(Some(result))
Expand All @@ -5907,8 +5907,8 @@ where
Some(string_map) => {
let mut result = std::collections::HashMap::new();
for (k, v) in string_map {
let datetime_key = DateTime::parse_from_str(&k, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_value = DateTime::parse_from_str(&v, "%Y-%m-%dT%H:%M:%S%.3f%Z").map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_key = DateTime::parse_from_rfc3339(&k).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
let datetime_value = DateTime::parse_from_rfc3339(&v).map(|dt| dt.with_timezone(&Utc)).map_err(serde::de::Error::custom)?;
result.insert(datetime_key, datetime_value);
}
Ok(Some(result))
Expand Down
Loading
Loading