(fix) Patch for older templates before contract support

Signed-off-by: Jerome Simeon <jeromesimeon@me.com>

Author: jeromesimeon

packages/cicero-cli/lib/commands.js

@@ -84,7 +84,11 @@ class Commands {
         const packageJsonExists = fs.existsSync(path.resolve(argv.template,'package.json'));
         let isCiceroTemplate = false;
         if(packageJsonExists){
-            const packageJsonContents = JSON.parse(fs.readFileSync(path.resolve(argv.template,'package.json')),'utf8');
+            let packageJsonContents = JSON.parse(fs.readFileSync(path.resolve(argv.template,'package.json')),'utf8');
+            // XXX Patch/Hack for backward compatibility with old templates XXX
+            if (!packageJsonContents.cicero) {
+                packageJsonContents.cicero = { 'template': 'clause', 'version': '^0.3.0' };
+            }
             isCiceroTemplate = packageJsonContents.cicero;
         }
 
@@ -177,7 +181,12 @@ class Commands {
         const packageJsonExists = fs.existsSync(path.resolve(argv.template,'package.json'));
         let isCiceroTemplate = false;
         if(packageJsonExists){
-            const packageJsonContents = JSON.parse(fs.readFileSync(path.resolve(argv.template,'package.json')),'utf8');
+            let packageJsonContents = JSON.parse(fs.readFileSync(path.resolve(argv.template,'package.json')),'utf8');
+            // XXX Patch/Hack for backward compatibility with old templates XXX
+            if (!packageJsonContents.cicero) {
+                packageJsonContents.cicero = { 'template': 'clause', 'version': '^0.3.0' };
+            }
+
             isCiceroTemplate = packageJsonContents.cicero;
         }
 

packages/cicero-core/lib/template.js

@@ -69,6 +69,11 @@ class Template {
      */
     constructor(packageJson, readme, samples) {
 
+        // XXX Patch/Hack for backward compatibility with old templates XXX
+        if (!packageJson.cicero) {
+            packageJson.cicero = { 'template': 'clause', 'version': '^0.3.0' };
+        }
+
         this.modelManager = new ModelManager();
         if(this.modelManager.getModelFile('org.accordproject.common') === undefined){
             const model = fs.readFileSync(fsPath.resolve(common), ENCODING);
@@ -1122,7 +1127,6 @@ class Template {
         logger.debug(types);
         return types;
     }
-
 }
 
 module.exports = Template;

packages/cicero-engine/lib/engine.js

@@ -91,9 +91,9 @@ class Engine {
         }
 
         const head = `
-        __dispatch(contract,request,state,moment());
+        __dispatch(contract,data,request,state,moment());
 
-        function __dispatch(contract,request,state,now) {
+        function __dispatch(contract,data,request,state,now) {
             switch(request.getFullyQualifiedType()) {
         `;
 
@@ -105,7 +105,7 @@ class Engine {
                 let ns${n} = type${n}.substr(0, type${n}.lastIndexOf('.'));
                 let clazz${n} = type${n}.substr(type${n}.lastIndexOf('.')+1);
                 let response${n} = factory.newTransaction(ns${n}, clazz${n});
-                let context${n} = {request: request, state: state, contract: contract, response: response${n}, emit: [], now: now};
+                let context${n} = {request: request, state: state, contract: contract, data: data, response: response${n}, emit: [], now: now};
                 ${ele.getName()}(context${n});
                 return { response: context${n}.response, state: context${n}.state, emit: context${n}.emit };
             break;`;
@@ -166,6 +166,7 @@ class Engine {
 
         // add immutables to the context
         vm.freeze(validContract, 'contract'); // Second argument adds object to global.
+        vm.freeze(validContract, 'data'); // Second argument adds object to global.
         vm.freeze(validRequest, 'request'); // Second argument adds object to global.
         vm.freeze(validState, 'state'); // Second argument adds object to global.