support for composer 0.3.0 and composer.mask

Fixes #904

Author: starpit

app/plugins/modules/composer/package.json

@@ -12,7 +12,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@ibm-functions/composer": "^0.2.2",
+    "@ibm-functions/composer": "^0.3.0",
     "chokidar": "^2.0.3"
   }
 }

app/plugins/modules/editor/lib/languages/composer-javascript.js

@@ -44,6 +44,11 @@ const strings = {
         detail: 'var=value; task1 -> task2',
         args: ['variable', 'value', 'task1', 'task2']
     },
+    mask: {
+        documentation: 'Execute a given composition masking any enclosing variable bindings',
+        detail: 'mask enclosing variable bindings',
+        args: ['composition']
+    },
     while: {
         documentation: 'While a condition holds, execute a task',
         detail: 'while (cond) task',

app/plugins/modules/wskflow/lib/fsm2graph.js

@@ -486,6 +486,23 @@ function ir2graph(ir, gm, id, prevId, options={}){	// ir and graph model
 			let lastBodyNode = ir2graph(ir.body, gm, `${id}-body`, prevId, undefined, options);
 			return ir2graph(ir.finalizer, gm, `${id}-finalizer`, lastBodyNode, undefined, options);
 		}
+	        else if(typeof ir.body === 'object'){
+                    // generic handler for any subgraph-via-body node
+                    const body = drawNodeNew(id, ir.type, ir.type, undefined, options)
+                    body.children = []
+                    body.edges = []
+		    gm.children.push(body);
+
+                    if(prevId)
+		        prevId.forEach(pid => gm.edges.push(drawEdgeNew(pid, id, gm)));
+
+		    ir2graph(ir.body, body, `${id}-body`, undefined, options)
+
+                    return [id]
+
+		} else {
+                    console.error('wskflow warning! unsupported node type', ir)
+                }
 	}
 }
 

tests/data/composer-source/mask.js

@@ -0,0 +1 @@
+composer.mask(composer.sequence('echo1', 'echo2'))

tests/tests/passes/07/composer-viz.js

@@ -46,6 +46,7 @@ const fsm = input('fsm.json'), fsmStruct = JSON.parse(fs.readFileSync(fsm.path).
       retry5Times = composerInput('retry-5-times.js'),
       demo = composerInput('demo.js'),
       demoRetain = composerInput('demo-retain.js'),
+      mask = composerInput('mask.js'),
       addSubscription = composerErrorInput('addSubscription.js')
 
 /**
@@ -228,6 +229,14 @@ describe('show the composer visualization without creating openwhisk assets', fu
        .then(verifyOutgoingEdgeExists('DivideByTwo'))
        .catch(common.oops(this)))
 
+    /** test: from the openwhisk-composer/samples directory */
+    it(`show visualization from javascript source ${mask.path}`, () => cli.do(`app viz ${mask.path}`, this.app)
+       .then(verifyTheBasicStuff(mask.file, 'composerLib'))
+       .then(verifyNodeExists('echo1'))
+       .then(verifyNodeExists('echo2'))
+       .then(verifyEdgeExists('echo1', 'echo2'))
+       .catch(common.oops(this)))
+
     it(`fail to show visualization for addSubscription without -e for env var assignment`, () => cli.do(`preview ${addSubscription.path}`, this.app)
        .then(cli.expectError(0, 'SLACK_TOKEN required in environment'))
        .catch(common.oops(this)))