feature(decorators) Add concerto metamodel + decorators for CiceroMar…

…k/TemplateMark/Slate Signed-off-by: Jerome Simeon <[email protected]>
accordproject · Sep 15, 2020 · 841277a · 841277a
1 parent 4975fc6
commit 841277a
Show file tree

Hide file tree

Showing 20 changed files with 6,616 additions and 13,915 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/markdown-cicero/index.js b/packages/markdown-cicero/index.js
@@ -19,6 +19,7 @@
  * @module markdown-transform
  */
 
+module.exports.ConcertoMetaModel = require('./lib/externalModels/ConcertoMetaModel');
 module.exports.CiceroMarkModel = require('./lib/externalModels/CiceroMarkModel');
 
 module.exports.CiceroMarkTransformer = require('./lib/CiceroMarkTransformer');

diff --git a/packages/markdown-cicero/lib/CiceroMarkTransformer.js b/packages/markdown-cicero/lib/CiceroMarkTransformer.js
@@ -29,6 +29,7 @@ const { CommonMarkModel } = require('@accordproject/markdown-common').CommonMark
 const FromCiceroEditVisitor = require('./FromCiceroEditVisitor');
 const ToCommonMarkVisitor = require('./ToCommonMarkVisitor');
 const { CiceroMarkModel } = require('./externalModels/CiceroMarkModel');
+const { ConcertoMetaModel } = require('./externalModels/ConcertoMetaModel');
 const unquoteVariables = require('./UnquoteVariables');
 
 /**
@@ -47,6 +48,7 @@ class CiceroMarkTransformer {
 
         // Setup for validation
         this.modelManager = new ModelManager();
+        this.modelManager.addModelFile(ConcertoMetaModel, 'metamodel.cto');
         this.modelManager.addModelFile(CommonMarkModel, 'commonmark.cto');
         this.modelManager.addModelFile(CiceroMarkModel, 'ciceromark.cto');
         const factory = new Factory(this.modelManager);

diff --git a/packages/markdown-cicero/lib/ToCiceroMarkUnwrappedVisitor.js b/packages/markdown-cicero/lib/ToCiceroMarkUnwrappedVisitor.js
@@ -68,6 +68,7 @@ class ToCiceroMarkUnwrappedVisitor {
 
             delete thing.name;
             delete thing.elementType;
+            delete thing.decorators;
         }
             break;
         case 'Variable':
@@ -78,6 +79,7 @@ class ToCiceroMarkUnwrappedVisitor {
             thing.text = decodeURIComponent(thing.value);
 
             delete thing.elementType;
+            delete thing.decorators;
             delete thing.name;
             delete thing.value;
             delete thing.format;

diff --git a/packages/markdown-slate/lib/SlateTransformer.js b/packages/markdown-slate/lib/SlateTransformer.js
@@ -36,13 +36,13 @@ class SlateTransformer {
      * @returns {*} Slate JSON
      */
     fromCiceroMark(input) {
-
         if(!input.getType) {
             input = this.serializer.fromJSON(input);
         }
 
         const CLAUSE = 'clause';
         const parameters = {};
+        parameters.serializer = this.serializer;
         parameters.result = {};
         const visitor = new ToSlateVisitor();
         input.accept( visitor, parameters );

diff --git a/packages/markdown-slate/lib/ToSlateVisitor.js b/packages/markdown-slate/lib/ToSlateVisitor.js
@@ -195,6 +195,7 @@ class ToSlateVisitor {
         nodes.forEach(node => {
             //console.log(`Processing ${thing.getType()} > ${node.getType()}`);
             const newParameters = {
+                serializer: parameters.serializer,
                 strong: parameters.strong,
                 emph: parameters.emph,
             };
@@ -238,6 +239,9 @@ class ToSlateVisitor {
             if (thing.elementType) {
                 data.elementType = thing.elementType;
             }
+            if (thing.decorators) {
+                data.decorators = thing.decorators.map(x => parameters.serializer.toJSON(x));
+            }
             result = {
                 object: 'block',
                 type: 'clause',
@@ -251,6 +255,9 @@ class ToSlateVisitor {
             if (thing.elementType) {
                 data.elementType = thing.elementType;
             }
+            if (thing.decorators) {
+                data.decorators = thing.decorators.map(x => parameters.serializer.toJSON(x));
+            }
             if (thing.identifiedBy) {
                 data.identifiedBy = thing.identifiedBy;
             }
@@ -262,6 +269,9 @@ class ToSlateVisitor {
             if (thing.elementType) {
                 data.elementType = thing.elementType;
             }
+            if (thing.decorators) {
+                data.decorators = thing.decorators.map(x => parameters.serializer.toJSON(x));
+            }
             result = ToSlateVisitor.handleVariable('variable', data, thing.value, parameters);
         }
             break;
@@ -270,6 +280,9 @@ class ToSlateVisitor {
             if (thing.elementType) {
                 data.elementType = thing.elementType;
             }
+            if (thing.decorators) {
+                data.decorators = thing.decorators.map(x => parameters.serializer.toJSON(x));
+            }
             result = ToSlateVisitor.handleVariable('variable', data, thing.value, parameters);
         }
             break;
@@ -284,6 +297,9 @@ class ToSlateVisitor {
             if (thing.elementType) {
                 data.elementType = thing.elementType;
             }
+            if (thing.decorators) {
+                data.decorators = thing.decorators.map(x => parameters.serializer.toJSON(x));
+            }
             result = ToSlateVisitor.handleConditionalVariable(data, nodes, localParameters);
         }
             break;
@@ -298,6 +314,9 @@ class ToSlateVisitor {
             if (thing.elementType) {
                 data.elementType = thing.elementType;
             }
+            if (thing.decorators) {
+                data.decorators = thing.decorators.map(x => parameters.serializer.toJSON(x));
+            }
             result = ToSlateVisitor.handleOptionalVariable(data, nodes, localParameters);
         }
             break;
@@ -477,6 +496,9 @@ class ToSlateVisitor {
             if (thing.elementType) {
                 data.elementType = thing.elementType;
             }
+            if (thing.decorators) {
+                data.decorators = thing.decorators.map(x => parameters.serializer.toJSON(x));
+            }
             result = {
                 object: 'block',
                 data: data,