update wskflow to work with composer v4

update tests to work with composer v4

update helper functions in composer to work with v4

fixes wskflow to allow custom objects generated by composer v4

edited rules for hiding inline functinos to work wtih composer v4

changes for composer 0.4.0-test.2

update package.json to point to the latest composer on npm

removed console logs

Author: Kerry Chang

lib/composer.js

@@ -464,7 +464,7 @@ exports.create = ({name, fsm, type, annotations=[], parameters=[], wsk, commandT
                        ])
         .then(([currentAction]) => {
             // now we merge together the parameters and annotations
-            const fsmAction = fsm.encode(fqnAppName).actions[0].action
+            const fsmAction = openwhiskComposer.encode(openwhiskComposer.composition(fqnAppName, fsm), "0.4.0").actions[0].action
             fsmAction.parameters = currentAction.parameters.concat(parameters).concat(fsmAction.parameters || []),
             fsmAction.annotations = mergeAnnotations(currentAction.annotations,
                                                      mergeAnnotations(annotations||[], fsmAction.annotations||[]),
@@ -757,25 +757,28 @@ exports.decorateAsApp = ({action, viewName='app', commandPrefix='app get', doVis
  * Extract the Action Tasks from a given FSM
  *
  */
-exports.extractActionsFromFSM = ({composition=[]}={}) => {
+exports.extractActionsFromFSM = (composition) => {
     const actions = []
 
     /** recursively add actions from the given root sequence */
-    const iter = root => root.forEach(node => {
-        if (node.type === 'action') {
-            actions.push(node.name)
-        } else {
-            for (let key in node) {
-                if (util.isArray(node[key])) {
-                    iter(node[key])
-                }
-            }
+    const iter = root => {
+        if(root.type === 'action'){
+            actions.push(root.name);
         }
-    })
+        else{
+            Object.keys(root).forEach(key => {        
+                if(Array.isArray(root[key])){
+                    root[key].forEach(obj => iter(obj));                    
+                }
+                else if(typeof root[key] === 'object' && root[key] !== null){
+                    iter(root[key])
+                }
+            })
+        }        
+    }
 
-    // start from the root
+    // start from the root    
     iter(composition)
-
     return actions
 }
 

package.json

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