fix(metamodel) Switches to Concerto metamodel 0.3

Signed-off-by: jeromesimeon <[email protected]>
accordproject · Sep 27, 2021 · b4a3ad8 · b4a3ad8
1 parent 0bb4042
commit b4a3ad8
Show file tree

Hide file tree

Showing 9 changed files with 435 additions and 437 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/concerto-cli/test/models/contract.json b/packages/concerto-cli/test/models/contract.json
@@ -2,8 +2,8 @@
   "$class": "concerto.metamodel.ModelFile",
   "namespace": "org.accordproject.cicero.contract",
   "imports": [],
-  "enumDeclarations": [],
-  "classDeclarations": [
+  "enums": [],
+  "concepts": [
     {
       "$class": "concerto.metamodel.AssetDeclaration",
       "name": "AccordContractState",
@@ -12,12 +12,12 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "stateId"
       },
-      "fields": [
+      "properties": [
         {
           "name": "stateId",
           "isArray": false,
           "isOptional": false,
-          "$class": "concerto.metamodel.StringFieldDeclaration"
+          "$class": "concerto.metamodel.StringProperty"
         }
       ]
     }, 
@@ -29,12 +29,12 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "partyId"
       },
-      "fields": [
+      "properties": [
         {
           "name": "partyId",
           "isArray": false,
           "isOptional": false,
-          "$class": "concerto.metamodel.StringFieldDeclaration"
+          "$class": "concerto.metamodel.StringProperty"
         }
       ]
     }, 
@@ -46,15 +46,15 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "contractId"
       },
-      "fields": [
+      "properties": [
         {
           "name": "contractId",
           "isArray": false,
           "isOptional": false,
-          "$class": "concerto.metamodel.StringFieldDeclaration"
+          "$class": "concerto.metamodel.StringProperty"
         }, 
         {
-          "$class": "concerto.metamodel.RelationshipDeclaration",
+          "$class": "concerto.metamodel.RelationshipProperty",
           "type": {
             "$class": "concerto.metamodel.TypeIdentifier",
             "name": "AccordParty"
@@ -73,12 +73,12 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "clauseId"
       },
-      "fields": [
+      "properties": [
         {
           "name": "clauseId",
           "isArray": false,
           "isOptional": false,
-          "$class": "concerto.metamodel.StringFieldDeclaration"
+          "$class": "concerto.metamodel.StringProperty"
         }
       ]
     }

diff --git a/packages/concerto-cli/test/models/contractResolved.json b/packages/concerto-cli/test/models/contractResolved.json
@@ -2,8 +2,8 @@
   "$class": "concerto.metamodel.ModelFile",
   "namespace": "org.accordproject.cicero.contract",
   "imports": [],
-  "enumDeclarations": [],
-  "classDeclarations": [
+  "enums": [],
+  "concepts": [
     {
       "$class": "concerto.metamodel.AssetDeclaration",
       "isAbstract": false,
@@ -12,9 +12,9 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "stateId"
       },
-      "fields": [
+      "properties": [
         {
-          "$class": "concerto.metamodel.StringFieldDeclaration",
+          "$class": "concerto.metamodel.StringProperty",
           "name": "stateId",
           "isArray": false,
           "isOptional": false
@@ -29,9 +29,9 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "partyId"
       },
-      "fields": [
+      "properties": [
         {
-          "$class": "concerto.metamodel.StringFieldDeclaration",
+          "$class": "concerto.metamodel.StringProperty",
           "name": "partyId",
           "isArray": false,
           "isOptional": false
@@ -46,15 +46,15 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "contractId"
       },
-      "fields": [
+      "properties": [
         {
-          "$class": "concerto.metamodel.StringFieldDeclaration",
+          "$class": "concerto.metamodel.StringProperty",
           "name": "contractId",
           "isArray": false,
           "isOptional": false
         }, 
         {
-          "$class": "concerto.metamodel.RelationshipDeclaration",
+          "$class": "concerto.metamodel.RelationshipProperty",
           "type": {
             "$class": "concerto.metamodel.TypeIdentifier",
             "name": "AccordParty",
@@ -74,9 +74,9 @@
         "$class": "concerto.metamodel.IdentifiedBy",
         "name": "clauseId"
       },
-      "fields": [
+      "properties": [
         {
-          "$class": "concerto.metamodel.StringFieldDeclaration",
+          "$class": "concerto.metamodel.StringProperty",
           "name": "clauseId",
           "isArray": false,
           "isOptional": false

diff --git a/packages/concerto-core/api.txt b/packages/concerto-core/api.txt
@@ -115,21 +115,21 @@ class ModelFileDownloader {
    + object createNameTable() 
    + string resolveName() 
    + object resolveTypeNames() 
-   + object enumFieldToMetaModel() 
+   + object enumPropertyToMetaModel() 
    + object decoratorArgToMetaModel() 
    + object decoratorToMetaModel() 
    + object decoratorsToMetaModel() 
-   + object fieldToMetaModel() 
+   + object propertyToMetaModel() 
    + object relationshipToMetaModel() 
    + object enumDeclToMetaModel() 
-   + object classDeclToMetaModel() 
+   + object conceptDeclToMetaModel() 
    + object declToMetaModel() 
    + object modelToMetaModel() 
    + object modelFileToMetaModel() 
    + string decoratorArgFromMetaModel() 
    + string decoratorFromMetaModel() 
    + string decoratorsFromMetaModel() 
-   + string fieldFromMetaModel() 
+   + string propertyFromMetaModel() 
    + string declFromMetaModel() 
    + string ctoFromMetaModel() 
    + object ctoToMetaModel() 

diff --git a/packages/concerto-core/changelog.txt b/packages/concerto-core/changelog.txt
@@ -24,6 +24,9 @@
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
 
+Version 1.2.2 {c4db3671d5ff6fddbb99027cb9277d51} 2021-08-12
+- Fixes to metamodel, with terminology changes
+
 Version 1.1.2 {2c9512d9d90bde289b47942937d252ca} 2021-08-12
 - Add Factory.newId for creating new unique IDs