feat(*): add decorators to model files (resolves #491) (#492)

* feat(*): add decorators to model files (resolves #491)

Signed-off-by: Simon Stone <[email protected]>

* feat(*): handle review comments

Signed-off-by: Simon Stone <[email protected]>

Signed-off-by: Simon Stone <[email protected]>

Author: Simon Stone

packages/concerto-cli/test/models/contract.json

@@ -1 +1 @@
-{"$class":"[email protected]","namespace":"org.accordproject.cicero.contract","imports":[],"declarations":[{"$class":"[email protected]","name":"AccordContractState","isAbstract":false,"properties":[{"$class":"[email protected]","name":"stateId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":809,"line":24,"column":3,"$class":"[email protected]"},"end":{"offset":826,"line":25,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":757,"line":23,"column":1,"$class":"[email protected]"},"end":{"offset":827,"line":25,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"stateId"}},{"$class":"[email protected]","name":"AccordParty","isAbstract":false,"properties":[{"$class":"[email protected]","name":"partyId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":907,"line":29,"column":3,"$class":"[email protected]"},"end":{"offset":924,"line":30,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":857,"line":28,"column":1,"$class":"[email protected]"},"end":{"offset":925,"line":30,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"partyId"}},{"$class":"[email protected]","name":"AccordContract","isAbstract":true,"properties":[{"$class":"[email protected]","name":"contractId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1049,"line":34,"column":3,"$class":"[email protected]"},"end":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"}}},{"$class":"[email protected]","name":"parties","type":{"$class":"[email protected]","name":"AccordParty"},"isArray":true,"isOptional":true,"location":{"$class":"[email protected]","start":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"},"end":{"offset":1106,"line":36,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":990,"line":33,"column":1,"$class":"[email protected]"},"end":{"offset":1107,"line":36,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"contractId"}},{"$class":"[email protected]","name":"AccordClause","isAbstract":true,"properties":[{"$class":"[email protected]","name":"clauseId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1224,"line":40,"column":3,"$class":"[email protected]"},"end":{"offset":1242,"line":41,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":1169,"line":39,"column":1,"$class":"[email protected]"},"end":{"offset":1243,"line":41,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"clauseId"}}]}
+{"$class":"[email protected]","decorators":[],"namespace":"org.accordproject.cicero.contract","imports":[],"declarations":[{"$class":"[email protected]","name":"AccordContractState","isAbstract":false,"properties":[{"$class":"[email protected]","name":"stateId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":809,"line":24,"column":3,"$class":"[email protected]"},"end":{"offset":826,"line":25,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":757,"line":23,"column":1,"$class":"[email protected]"},"end":{"offset":827,"line":25,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"stateId"}},{"$class":"[email protected]","name":"AccordParty","isAbstract":false,"properties":[{"$class":"[email protected]","name":"partyId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":907,"line":29,"column":3,"$class":"[email protected]"},"end":{"offset":924,"line":30,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":857,"line":28,"column":1,"$class":"[email protected]"},"end":{"offset":925,"line":30,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"partyId"}},{"$class":"[email protected]","name":"AccordContract","isAbstract":true,"properties":[{"$class":"[email protected]","name":"contractId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1049,"line":34,"column":3,"$class":"[email protected]"},"end":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"}}},{"$class":"[email protected]","name":"parties","type":{"$class":"[email protected]","name":"AccordParty"},"isArray":true,"isOptional":true,"location":{"$class":"[email protected]","start":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"},"end":{"offset":1106,"line":36,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":990,"line":33,"column":1,"$class":"[email protected]"},"end":{"offset":1107,"line":36,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"contractId"}},{"$class":"[email protected]","name":"AccordClause","isAbstract":true,"properties":[{"$class":"[email protected]","name":"clauseId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1224,"line":40,"column":3,"$class":"[email protected]"},"end":{"offset":1242,"line":41,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":1169,"line":39,"column":1,"$class":"[email protected]"},"end":{"offset":1243,"line":41,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"clauseId"}}]}

packages/concerto-cli/test/models/contractResolved.json

@@ -1 +1 @@
-{"$class":"[email protected]","namespace":"org.accordproject.cicero.contract","imports":[],"declarations":[{"$class":"[email protected]","name":"AccordContractState","isAbstract":false,"properties":[{"$class":"[email protected]","name":"stateId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":809,"line":24,"column":3,"$class":"[email protected]"},"end":{"offset":826,"line":25,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":757,"line":23,"column":1,"$class":"[email protected]"},"end":{"offset":827,"line":25,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"stateId"}},{"$class":"[email protected]","name":"AccordParty","isAbstract":false,"properties":[{"$class":"[email protected]","name":"partyId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":907,"line":29,"column":3,"$class":"[email protected]"},"end":{"offset":924,"line":30,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":857,"line":28,"column":1,"$class":"[email protected]"},"end":{"offset":925,"line":30,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"partyId"}},{"$class":"[email protected]","name":"AccordContract","isAbstract":true,"properties":[{"$class":"[email protected]","name":"contractId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1049,"line":34,"column":3,"$class":"[email protected]"},"end":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"}}},{"$class":"[email protected]","name":"parties","type":{"$class":"[email protected]","name":"AccordParty","namespace":"org.accordproject.cicero.contract"},"isArray":true,"isOptional":true,"location":{"$class":"[email protected]","start":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"},"end":{"offset":1106,"line":36,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":990,"line":33,"column":1,"$class":"[email protected]"},"end":{"offset":1107,"line":36,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"contractId"}},{"$class":"[email protected]","name":"AccordClause","isAbstract":true,"properties":[{"$class":"[email protected]","name":"clauseId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1224,"line":40,"column":3,"$class":"[email protected]"},"end":{"offset":1242,"line":41,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":1169,"line":39,"column":1,"$class":"[email protected]"},"end":{"offset":1243,"line":41,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"clauseId"}}]}
+{"$class":"[email protected]","decorators":[],"namespace":"org.accordproject.cicero.contract","imports":[],"declarations":[{"$class":"[email protected]","name":"AccordContractState","isAbstract":false,"properties":[{"$class":"[email protected]","name":"stateId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":809,"line":24,"column":3,"$class":"[email protected]"},"end":{"offset":826,"line":25,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":757,"line":23,"column":1,"$class":"[email protected]"},"end":{"offset":827,"line":25,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"stateId"}},{"$class":"[email protected]","name":"AccordParty","isAbstract":false,"properties":[{"$class":"[email protected]","name":"partyId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":907,"line":29,"column":3,"$class":"[email protected]"},"end":{"offset":924,"line":30,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":857,"line":28,"column":1,"$class":"[email protected]"},"end":{"offset":925,"line":30,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"partyId"}},{"$class":"[email protected]","name":"AccordContract","isAbstract":true,"properties":[{"$class":"[email protected]","name":"contractId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1049,"line":34,"column":3,"$class":"[email protected]"},"end":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"}}},{"$class":"[email protected]","name":"parties","type":{"$class":"[email protected]","name":"AccordParty","namespace":"org.accordproject.cicero.contract"},"isArray":true,"isOptional":true,"location":{"$class":"[email protected]","start":{"offset":1071,"line":35,"column":3,"$class":"[email protected]"},"end":{"offset":1106,"line":36,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":990,"line":33,"column":1,"$class":"[email protected]"},"end":{"offset":1107,"line":36,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"contractId"}},{"$class":"[email protected]","name":"AccordClause","isAbstract":true,"properties":[{"$class":"[email protected]","name":"clauseId","isArray":false,"isOptional":false,"location":{"$class":"[email protected]","start":{"offset":1224,"line":40,"column":3,"$class":"[email protected]"},"end":{"offset":1242,"line":41,"column":1,"$class":"[email protected]"}}}],"location":{"$class":"[email protected]","start":{"offset":1169,"line":39,"column":1,"$class":"[email protected]"},"end":{"offset":1243,"line":41,"column":2,"$class":"[email protected]"}},"identified":{"$class":"[email protected]","name":"clauseId"}}]}