diff --git a/lib/codegen/fromcto/rust/rustvisitor.js b/lib/codegen/fromcto/rust/rustvisitor.js index a356bf05..1a0bc7e1 100644 --- a/lib/codegen/fromcto/rust/rustvisitor.js +++ b/lib/codegen/fromcto/rust/rustvisitor.js @@ -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?.()) { @@ -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)) { @@ -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, ''); @@ -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, '}'); @@ -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)'); @@ -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, '}'); @@ -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, '}'); @@ -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, @@ -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, '}'); @@ -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, '}'); @@ -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, diff --git a/test/codegen/__snapshots__/codegen.js.snap b/test/codegen/__snapshots__/codegen.js.snap index 3ef5a8bb..befd1762 100644 --- a/test/codegen/__snapshots__/codegen.js.snap +++ b/test/codegen/__snapshots__/codegen.js.snap @@ -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(datetime: &chrono::DateTime, serializer: S) -> Result @@ -5730,7 +5730,7 @@ where let datetime_strings = Vec::::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() } @@ -5754,7 +5754,7 @@ where Some(datetime_strings) => { let result: Result, _> = 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) }, @@ -5780,7 +5780,7 @@ where let string_map = std::collections::HashMap::::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) @@ -5804,7 +5804,7 @@ where let string_map = std::collections::HashMap::::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) @@ -5828,8 +5828,8 @@ where let string_map = std::collections::HashMap::::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) @@ -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)) @@ -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)) @@ -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)) diff --git a/test/codegen/fromcto/rust/rustvisitor.js b/test/codegen/fromcto/rust/rustvisitor.js index 313856c3..0ff08af0 100644 --- a/test/codegen/fromcto/rust/rustvisitor.js +++ b/test/codegen/fromcto/rust/rustvisitor.js @@ -623,6 +623,73 @@ describe('RustVisitor', function () { ]); }); + it('should default an optional date field to None when it is missing', () => { + const mockField = sinon.createStubInstance(Field); + mockField.isPrimitive.returns(false); + mockField.name = 'shipped'; + mockField.type = 'DateTime'; + mockField.isOptional.returns(true); + + const mockModelManager = sinon.createStubInstance(ModelManager); + const mockModelFile = sinon.createStubInstance(ModelFile); + const mockClassDeclaration = + sinon.createStubInstance(ClassDeclaration); + + mockModelManager.getType.returns(mockClassDeclaration); + mockModelFile.getModelManager.returns(mockModelManager); + mockClassDeclaration.getModelFile.returns(mockModelFile); + mockField.getParent.returns(mockClassDeclaration); + rustVisitor.visitField(mockField, param); + + param.fileWriter.writeLine + .getCalls() + .map((call) => call.args) + .should.deep.equal([ + [1, '#[serde('], + [2, 'rename = "shipped",'], + [2, 'skip_serializing_if = "Option::is_none",'], + [2, 'default,'], + [2, 'serialize_with = "serialize_datetime_option",'], + [2, 'deserialize_with = "deserialize_datetime_option",'], + [1, ')]'], + [1, 'pub shipped: Option>,'], + ]); + }); + + it('should default an optional date array field to None when it is missing', () => { + const mockField = sinon.createStubInstance(Field); + mockField.isPrimitive.returns(false); + mockField.name = 'scans'; + mockField.type = 'DateTime'; + mockField.isArray.returns(true); + mockField.isOptional.returns(true); + + const mockModelManager = sinon.createStubInstance(ModelManager); + const mockModelFile = sinon.createStubInstance(ModelFile); + const mockClassDeclaration = + sinon.createStubInstance(ClassDeclaration); + + mockModelManager.getType.returns(mockClassDeclaration); + mockModelFile.getModelManager.returns(mockModelManager); + mockClassDeclaration.getModelFile.returns(mockModelFile); + mockField.getParent.returns(mockClassDeclaration); + rustVisitor.visitField(mockField, param); + + param.fileWriter.writeLine + .getCalls() + .map((call) => call.args) + .should.deep.equal([ + [1, '#[serde('], + [2, 'rename = "scans",'], + [2, 'skip_serializing_if = "Option::is_none",'], + [2, 'default,'], + [2, 'serialize_with = "serialize_datetime_array_option",'], + [2, 'deserialize_with = "deserialize_datetime_array_option",'], + [1, ')]'], + [1, 'pub scans: Option>>,'], + ]); + }); + it('should write a line with DateTime serialization for HashMap ', () => { let param = { fileWriter: mockFileWriter, @@ -819,6 +886,8 @@ describe('RustVisitor', function () { 2, 'skip_serializing_if = "Option::is_none",' ).calledOnce.should.be.ok; + param.fileWriter.writeLine.withArgs(2, 'default,').calledOnce + .should.be.ok; isPrimitiveTypeStub.restore(); isMapStub.restore(); @@ -1369,7 +1438,7 @@ describe('RustVisitor', function () { ], [ 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)', ], [0, '}'], [1, ''], @@ -1416,7 +1485,7 @@ describe('RustVisitor', function () { [2, '.iter()'], [ 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))', ], [2, '.collect()'], [0, '}'], @@ -1452,7 +1521,7 @@ describe('RustVisitor', function () { [4, '.iter()'], [ 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))', ], [4, '.collect();'], [3, 'result.map(Some)'], @@ -1496,7 +1565,7 @@ describe('RustVisitor', function () { [1, 'for (k, v) in string_map {'], [ 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)?;', ], [2, 'result.insert(datetime_key, v);'], [1, '}'], @@ -1538,7 +1607,7 @@ describe('RustVisitor', function () { [1, 'for (k, v) in string_map {'], [ 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)?;', ], [2, 'result.insert(k, datetime_value);'], [1, '}'], @@ -1580,11 +1649,11 @@ describe('RustVisitor', function () { [1, 'for (k, v) in string_map {'], [ 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)?;', ], [ 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)?;', ], [2, 'result.insert(datetime_key, datetime_value);'], [1, '}'], @@ -1623,7 +1692,7 @@ describe('RustVisitor', function () { [3, 'for (k, v) in string_map {'], [ 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)?;', ], [4, 'result.insert(datetime_key, v);'], [3, '}'], @@ -1665,7 +1734,7 @@ describe('RustVisitor', function () { [3, 'for (k, v) in string_map {'], [ 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)?;', ], [4, 'result.insert(k, datetime_value);'], [3, '}'], @@ -1707,11 +1776,11 @@ describe('RustVisitor', function () { [3, 'for (k, v) in string_map {'], [ 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)?;', ], [ 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)?;', ], [4, 'result.insert(datetime_key, datetime_value);'], [3, '}'], diff --git a/test/verification/rust.compile.test.js b/test/verification/rust.compile.test.js index 8541784f..5c268be2 100644 --- a/test/verification/rust.compile.test.js +++ b/test/verification/rust.compile.test.js @@ -20,6 +20,7 @@ const path = require('path'); const os = require('os'); const { dir } = require('tmp-promise'); +const { ModelManager } = require('@accordproject/concerto-core'); const { FileWriter } = require('@accordproject/concerto-util'); const RustVisitor = require('../../lib/codegen/fromcto/rust/rustvisitor.js'); @@ -126,4 +127,73 @@ describe('verification', function () { await verifyRustCompiles(modelManager, testCase.visitorOptions || {}); }); }); + + const dateTimeTitle = CARGO_SKIP_REASON + ? `generated Rust deserializes Concerto DateTime values (pending: ${CARGO_SKIP_REASON})` + : 'generated Rust deserializes Concerto DateTime values'; + (CARGO_SKIP_REASON ? it.skip : it)(dateTimeTitle, async function () { + const { path: outputDir, cleanup } = await dir({ unsafeCleanup: true }); + + try { + const src = path.join(outputDir, 'src'); + fs.mkdirSync(src, { recursive: true }); + + const modelManager = new ModelManager({ strict: true }); + modelManager.addCTOModel(` + namespace org.acme@1.0.0 + map Schedule { o String o DateTime } + transaction Order { + o DateTime placed + o DateTime shipped optional + o DateTime[] scans + o DateTime[] returns optional + o Schedule schedule optional + } + `, 'acme.cto'); + modelManager.accept(new RustVisitor(), { fileWriter: new FileWriter(src) }); + fs.renameSync(path.join(src, 'mod.rs'), path.join(src, 'lib.rs')); + + // Concerto JSON holds DateTime values as ISO 8601 strings, and + // leaves out optional properties that have no value. + fs.writeFileSync(path.join(src, 'main.rs'), [ + 'use chrono::{ TimeZone, Utc };', + 'use verify::org_acme_1_0_0::Order;', + '', + 'fn main() {', + ' let order: Order = serde_json::from_str(r#"{"$class":"org.acme@1.0.0.Order","$timestamp":"2024-01-02T03:04:05.678Z","placed":"2024-01-02T03:04:05.678Z","shipped":"2024-01-03T00:00:00.000+01:00","scans":["2024-01-04T00:00:00.000Z"],"returns":["2024-01-05T00:00:00.000Z"],"schedule":{"a":"2024-01-06T00:00:00.000Z"}}"#).unwrap();', + ' assert_eq!(order.placed, Utc.with_ymd_and_hms(2024, 1, 2, 3, 4, 5).unwrap() + chrono::Duration::milliseconds(678));', + ' assert_eq!(order._timestamp, order.placed);', + ' assert_eq!(order.shipped, Some(Utc.with_ymd_and_hms(2024, 1, 2, 23, 0, 0).unwrap()));', + ' assert_eq!(order.scans.len(), 1);', + ' assert_eq!(order.returns.map(|r| r.len()), Some(1));', + ' assert_eq!(order.schedule.map(|s| s.len()), Some(1));', + '', + ' let order: Order = serde_json::from_str(r#"{"$class":"org.acme@1.0.0.Order","$timestamp":"2024-01-02T03:04:05.678Z","placed":"2024-01-02T03:04:05.678Z","scans":[]}"#).unwrap();', + ' assert!(order.shipped.is_none() && order.returns.is_none() && order.schedule.is_none());', + '', + ' // The serialized form deserializes again.', + ' let json = serde_json::to_string(&order).unwrap();', + ' let again: Order = serde_json::from_str(&json).unwrap();', + ' assert_eq!(again.placed, order.placed);', + '}', + '', + ].join('\n')); + // cargo picks up src/main.rs as the crate's binary. + fs.writeFileSync(path.join(outputDir, 'Cargo.toml'), `${CARGO_TOML}serde_json = "1"\n`); + + try { + execFileSync('cargo', ['run', '--quiet'], { + cwd: outputDir, + encoding: 'utf-8', + stdio: ['ignore', 'pipe', 'pipe'], + env: { ...process.env, CARGO_TARGET_DIR: SHARED_TARGET_DIR }, + }); + } catch (err) { + const details = [err.stdout, err.stderr].filter(Boolean).join('\n').trim(); + throw new Error(details || err.message); + } + } finally { + await cleanup(); + } + }); });