chore(cicero) Switch to latest Ergo 0.21.3 and Markdown Transform 0.12.4

Signed-off-by: Jerome Simeon <[email protected]>
accordproject · Aug 11, 2020 · 2f6c2dc · 2f6c2dc
1 parent 54e0b5d
commit 2f6c2dc
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cicero-core/package.json b/packages/cicero-core/package.json
@@ -74,13 +74,13 @@
   },
   "dependencies": {
     "@accordproject/concerto-core": "0.82.8",
-    "@accordproject/ergo-compiler": "0.21.2",
-    "@accordproject/ergo-engine": "0.21.2",
-    "@accordproject/markdown-common": "^0.12.3",
-    "@accordproject/markdown-cicero": "^0.12.3",
-    "@accordproject/markdown-html": "^0.12.3",
-    "@accordproject/markdown-slate": "^0.12.3",
-    "@accordproject/markdown-template": "^0.12.3",
+    "@accordproject/ergo-compiler": "0.21.3",
+    "@accordproject/ergo-engine": "0.21.3",
+    "@accordproject/markdown-common": "^0.12.4",
+    "@accordproject/markdown-cicero": "^0.12.4",
+    "@accordproject/markdown-html": "^0.12.4",
+    "@accordproject/markdown-slate": "^0.12.4",
+    "@accordproject/markdown-template": "^0.12.4",
     "axios": "0.19.0",
     "debug": "4.1.0",
     "ietf-language-tag-regex": "0.0.5",

diff --git a/packages/cicero-core/src/template.js b/packages/cicero-core/src/template.js
@@ -20,7 +20,6 @@ const ParserManager = require('@accordproject/markdown-template').ParserManager;
 const crypto = require('crypto');
 const stringify = require('json-stable-stringify');
 const LogicManager = require('@accordproject/ergo-compiler').LogicManager;
-const Script = require('@accordproject/ergo-compiler/lib/script');
 const TemplateLoader = require('./templateloader');
 const TemplateSaver = require('./templatesaver');
 
@@ -63,15 +62,7 @@ class Template {
         if (this.getMetadata().getRuntime() === 'ergo') {
             this.getLogicManager().compileLogicSync(true);
         } else {
-            // XXX This should be moved to the logic manager -JS
-            const scriptManager = this.getLogicManager().getScriptManager();
-            const mainScript = scriptManager.getCombinedScripts();
-            if (mainScript) {
-                const script = new Script(this.getModelManager(), 'main.js', '.js', mainScript, null);
-                const contractName = script.getContractName();
-                if (contractName) { this.getLogicManager().setContractName(contractName); }
-                scriptManager.compiledScript = script;
-            }
+            this.getLogicManager().registerCompiledLogicSync();
         }
     }
 

diff --git a/packages/cicero-core/test/clause.js b/packages/cicero-core/test/clause.js
@@ -98,15 +98,15 @@ describe('Clause', () => {
             try {
                 await Template.fromDirectory('./test/data/bad-binding', options);
             } catch (err) {
-                err.message.should.equal('Unknown property articipant');
+                err.message.should.equal('Unknown property: articipant File text/grammar.tem.md line -1 column -1');
             }
         });
 
         it('should fail to create a clause for a template with a wrongly typed boolean binding', async function() {
             try {
                 await Template.fromDirectory('./test/data/bad-boolean-binding', options);
             } catch (err) {
-                err.message.should.equal('An if block can only be used with a boolean property. Property participant has type Participant File text/grammar.tem.md line 1 column 7');
+                err.message.should.equal('Conditional template not on a boolean property: participant File text/grammar.tem.md line -1 column -1');
             }
         });
 
@@ -381,7 +381,7 @@ Expected: 'I'm active' or 'I'm inactive'`);
             try {
                 await Template.fromDirectory('./test/data/block-ifelse-error', options);
             } catch (err) {
-                err.message.should.eql('An if block can only be used with a boolean property. Property isActive has type Double File text/grammar.tem.md line 1 column 7');
+                err.message.should.eql('Conditional template not on a boolean property: isActive File text/grammar.tem.md line -1 column -1');
             }
         });
 

diff --git a/packages/cicero-core/test/template.js b/packages/cicero-core/test/template.js
@@ -281,11 +281,11 @@ In case of delayed delivery except for Force Majeure cases, the Seller shall pay
         });
 
         it('should throw an error for property that is not declared', () => {
-            return Template.fromDirectory('./test/data/bad-property', options).should.be.rejectedWith('Unknown property currency');
+            return Template.fromDirectory('./test/data/bad-property', options).should.be.rejectedWith('Unknown property: currency');
         });
 
         it('should throw an error for clause property that is not declared', () => {
-            return Template.fromDirectory('./test/data/bad-copyright-license', options).should.be.rejectedWith('Unknown property badPaymentClause');
+            return Template.fromDirectory('./test/data/bad-copyright-license', options).should.be.rejectedWith('Unknown property: badPaymentClause');
         });
 
         it('should create an archive for a template with two Ergo modules', async () => {

diff --git a/packages/cicero-engine/package.json b/packages/cicero-engine/package.json
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@accordproject/cicero-core": "0.21.2",
-    "@accordproject/ergo-engine": "0.21.2",
+    "@accordproject/ergo-engine": "0.21.3",
     "moment-mini": "2.22.1"
   },
   "license-check-config": {

diff --git a/packages/cicero-test/package.json b/packages/cicero-test/package.json
@@ -48,7 +48,7 @@
   "dependencies": {
     "@accordproject/cicero-core": "0.21.2",
     "@accordproject/cicero-engine": "0.21.2",
-    "@accordproject/ergo-test": "0.21.2",
+    "@accordproject/ergo-test": "0.21.3",
     "chai": "4.2.0",
     "chai-things": "0.2.0",
     "cucumber": "5.1.0"