@accordproject/concerto-cto 1.2.2-20220111153301 → 1.2.2-20220113193236

package/index.js

@@ -15,7 +15,7 @@
 'use strict';
 
 /**
- * Concerto module. Concerto is a framework for defining domain
+ * Concerto CTO concrete syntax module. Concerto is a framework for defining domain
  * specific models.
  *
  * @module concerto-cto

package/lib/printer.js

@@ -157,11 +157,11 @@ function propertyFromMetaModel(mm) {
         result += '[]';
     }
     result += ` ${mm.name}`;
+    result += defaultString;
+    result += validatorString;
     if (mm.isOptional) {
         result += ' optional';
     }
-    result += defaultString;
-    result += validatorString;
     return result;
 }
 
@@ -199,10 +199,6 @@ function declFromMetaModel(mm) {
         result += `enum ${mm.name} `;
         break;
     }
-    if (mm.superType) {
-        result += `extends ${mm.superType.name} `;
-    }
-    // XXX Needs to be fixed to support `identified`
     if (mm.identified) {
         if (mm.identified.$class === 'concerto.metamodel.IdentifiedBy') {
             result += `identified by ${mm.identified.name} `;
@@ -210,6 +206,9 @@ function declFromMetaModel(mm) {
             result += 'identified ';
         }
     }
+    if (mm.superType) {
+        result += `extends ${mm.superType.name} `;
+    }
     result += '{';
     mm.properties.forEach((property) => {
         result += `\n  ${propertyFromMetaModel(property)}`;
@@ -225,6 +224,11 @@ function declFromMetaModel(mm) {
  */
 function toCTO(metaModel) {
     let result = '';
+    if (metaModel.concertoVersion) {
+        result += `concerto version "${metaModel.concertoVersion}"`;
+        result += '\n';
+        result += '\n';
+    }
     result += `namespace ${metaModel.namespace}`;
     if (metaModel.imports && metaModel.imports.length > 0) {
         result += '\n';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accordproject/concerto-cto",
-  "version": "1.2.2-20220111153301",
+  "version": "1.2.2-20220113193236",
   "description": "Parser for Concerto CTO files",
   "homepage": "https://github.com/accordproject/concerto",
   "engines": {