diff --git a/crates/aiken-project/src/blueprint/schema.rs b/crates/aiken-project/src/blueprint/schema.rs index b8cbd4b9..95809ce9 100644 --- a/crates/aiken-project/src/blueprint/schema.rs +++ b/crates/aiken-project/src/blueprint/schema.rs @@ -57,7 +57,7 @@ pub enum Items { #[derive(Debug, PartialEq, Eq, Clone)] pub struct Constructor { pub index: usize, - pub fields: Vec, + pub fields: Vec>, } impl From for Annotated { @@ -191,7 +191,7 @@ impl Annotated { description: Some("An optional value.".to_string()), annotated: Constructor { index: 0, - fields: vec![generic], + fields: vec![generic.into()], }, }, Annotated { @@ -367,7 +367,11 @@ impl Data { return Ok(schema.into_data(&field.tipo)?.annotated); } - fields.push(reference); + fields.push(Annotated { + title: field.label.clone(), + description: field.doc.clone().map(|s| s.trim().to_string()), + annotated: reference, + }); } let variant = Annotated { @@ -750,12 +754,12 @@ pub mod test { let schema = Schema::Data(Data::AnyOf(vec![ Constructor { index: 0, - fields: vec![Reference::new("Int")], + fields: vec![Reference::new("Int").into()], } .into(), Constructor { index: 1, - fields: vec![Reference::new("Bytes")], + fields: vec![Reference::new("Bytes").into()], } .into(), ])); diff --git a/crates/aiken-project/src/blueprint/validator.rs b/crates/aiken-project/src/blueprint/validator.rs index b31085d5..7a945413 100644 --- a/crates/aiken-project/src/blueprint/validator.rs +++ b/crates/aiken-project/src/blueprint/validator.rs @@ -459,12 +459,17 @@ mod test { "index": 0, "fields": [ { + "title": "contestationPeriod", + "description": "The contestation period as a number of seconds", "$ref": "#/definitions/test_module~1ContestationPeriod" }, { + "title": "parties", + "description": "List of public key hashes of all participants", "$ref": "#/definitions/List$ByteArray" }, { + "title": "utxoHash", "$ref": "#/definitions/ByteArray" } ] @@ -680,6 +685,7 @@ mod test { "index": 0, "fields": [ { + "title": "inner", "$ref": "#/definitions/List$Tuple$ByteArray_Int" } ] @@ -786,6 +792,7 @@ mod test { "index": 0, "fields": [ { + "title": "foo", "$ref": "#/definitions/Data" } ] @@ -965,6 +972,7 @@ mod test { "index": 0, "fields": [ { + "title": "foo", "$ref": "#/definitions/test_module~1LinkedList$Bool" } ] @@ -975,9 +983,11 @@ mod test { "index": 1, "fields": [ { + "title": "bar", "$ref": "#/definitions/Int" }, { + "title": "baz", "$ref": "#/definitions/Tuple$ByteArray_List$test_module~1LinkedList$Int" } ] diff --git a/examples/acceptance_tests/036/plutus.json b/examples/acceptance_tests/036/plutus.json index 2cd51ef2..2f5d03ed 100644 --- a/examples/acceptance_tests/036/plutus.json +++ b/examples/acceptance_tests/036/plutus.json @@ -74,9 +74,11 @@ "index": 0, "fields": [ { + "title": "transaction_id", "$ref": "#/definitions/aiken~1transaction~1TransactionId" }, { + "title": "output_index", "$ref": "#/definitions/Int" } ] @@ -93,6 +95,7 @@ "index": 0, "fields": [ { + "title": "hash", "$ref": "#/definitions/ByteArray" } ] diff --git a/examples/acceptance_tests/071/plutus.json b/examples/acceptance_tests/071/plutus.json index 8021b4b9..fc96b33e 100644 --- a/examples/acceptance_tests/071/plutus.json +++ b/examples/acceptance_tests/071/plutus.json @@ -39,9 +39,11 @@ "index": 0, "fields": [ { + "title": "policy_id", "$ref": "#/definitions/ByteArray" }, { + "title": "asset_name", "$ref": "#/definitions/ByteArray" } ] @@ -57,9 +59,11 @@ "index": 0, "fields": [ { + "title": "input_cs", "$ref": "#/definitions/spend~1CurrencySymbol" }, { + "title": "input_amount", "$ref": "#/definitions/Int" } ] @@ -75,12 +79,15 @@ "index": 0, "fields": [ { + "title": "currency_symbol", "$ref": "#/definitions/spend~1CurrencySymbol" }, { + "title": "balance", "$ref": "#/definitions/Int" }, { + "title": "lent_out", "$ref": "#/definitions/Int" } ] @@ -96,9 +103,11 @@ "index": 0, "fields": [ { + "title": "input_cs", "$ref": "#/definitions/spend~1CurrencySymbol" }, { + "title": "input_amount", "$ref": "#/definitions/Int" } ] @@ -114,6 +123,7 @@ "index": 0, "fields": [ { + "title": "action", "$ref": "#/definitions/spend~1PoolRedeemerType" } ] diff --git a/examples/hello_world/plutus.json b/examples/hello_world/plutus.json index b56c587f..9260b7cb 100644 --- a/examples/hello_world/plutus.json +++ b/examples/hello_world/plutus.json @@ -37,6 +37,7 @@ "index": 0, "fields": [ { + "title": "owner", "$ref": "#/definitions/ByteArray" } ] @@ -52,6 +53,7 @@ "index": 0, "fields": [ { + "title": "msg", "$ref": "#/definitions/ByteArray" } ]