Interpolation.md

@@ -0,0 +1,2 @@
+#worksmith interpolation guide
+

ReleaseNotes.md

@@ -1,4 +1,25 @@
 # Worksmith release notes
+## 0.2.3
+An array in  place of a task or workflow variable means an implicit "sequence" task
+```javascript
+var wf = worksmith([
+    { task: "set", name:"p1", value:"hello" },
+    { task:"log" },
+    { task:"eachSeries", item:[1,2,3], subflow: [
+        { task:"log" message:"@item" }, 
+        {task:"delay", duration:"[eval]item * 250[/eval]" }
+     ]}
+]);
+wf({}, function(err, res) { });
+```
+
+## 0.2.2
+Totally revamped interpolation logic, deep tree interpolation, array interpolation
+
+tag support to drive interpolation mode: {{hbs}} and {{eval}} are support out of the box
+
+## 0.1.7
+eachSeriesActivity and whileActivity
 
 ## 0.1.5
 Terminate a workflow or sequence from code (a programmable alternative to conditional="predicate" attribute)
@@ -41,4 +62,4 @@ connect existing functionality into a workflow using worksmith.use + worksmith.c
         assert.equal(context.myresult[0], context.items[0])
        done(); 
     });
-```
+```

index.js

@@ -15,6 +15,8 @@ var settings  = {
     logger: console
 }
 
+var interpolate = require('./src/interpolation').interpolate
+
 var worksmith
 
 function wfLoader(wf) {
@@ -23,6 +25,12 @@ function wfLoader(wf) {
         debug("loading workflow file: %s", wf)
         wf = require(wf);
     }
+    if(Array.isArray(wf)) {
+        wf = {
+            task: "sequence",
+            items: wf
+        }
+    }
     return worksmith.define(wf);
 }
 
@@ -31,8 +39,8 @@ worksmith = wfLoader
 function getStepName(step) {
     if (step.name) { return step.name }
     var name = step.name || step.task;
-    if ("function" === typeof name) { 
-        name =  "<Anonymous>" + name.name 
+    if ("function" === typeof name) {
+        name =  "<Anonymous>" + name.name
     }
     return step.name = name;
 }
@@ -42,17 +50,14 @@ var workflow = {
     use: function(ns, taskLibrary) {
         resolvers[ns] = taskLibrary;
     },
-    
+
     createAdapter: function(object) {
         return function getType(name) {
             var method = object[name];
             return function define(step) {
                 return function build(context) {
                     return function execute(done) {
                         var args = (context.get(step.arguments) || [])
-                                    .map(function(arg) {
-                                        return context.get(arg);
-                                    })
                         var result = method.apply(object, args)
                         done(undefined, result);
                     }
@@ -61,9 +66,13 @@ var workflow = {
         }
     },
     configure: function(options) {
-        _.extend(settings, options);
+        _.assignIn(settings, options);
     },
-
+
+    hasLogLevel: function(level) {
+        return settings.logger[level] !== undefined
+    },
+
     log: function() {
         var level = arguments[0]
         settings.logger[level].apply(settings.logger, Array.prototype.slice.call(arguments,1))
@@ -89,8 +98,8 @@ var workflow = {
         if ("string" === typeof task) return workflow.getTaskType(task);
         return task;
     },
-    
-    
+
+
 
     define: function (workflowDefinition) {
 
@@ -115,11 +124,11 @@ var workflow = {
 
         function initializeContext(context) {
             if (!context.initialized) {
-                context.get = function(name) {
-                    return workflow.readValue(name, context)
+                context.get = function(name, interpolate) {
+                    return workflow.readValue(name, this, interpolate)
                 },
                 context.set = function(name, value) {
-                    return workflow.setValue(context, name, value)
+                    return workflow.setValue(this, name, value)
                 }
                 context.initialized = true;
             }
@@ -132,11 +141,17 @@ var workflow = {
             var annotations = execute.annotations || build.annotations || WorkflowType.annotations;
             annotations = annotations || {};
             execute.inject && (annotations.inject = execute.inject);
-            annotations.inject && annotations.inject.forEach(function(name) {
+            annotations.inject && annotations.inject.forEach(function(injectable) {
+                if ("string" === typeof injectable) {
+                    injectable = {
+                        name: injectable,
+                        interpolationPolicy: true,
+                    }
+                }
                 var arg;
-                switch(name[0]) {
-                    case '@': arg = context.get(name); break;
-                    default: arg = context.get(workflowDefinition[name]); break;
+                switch(injectable.name[0]) {
+                    case '@': arg = context.get(injectable.name); break;
+                    default: arg = context.get(workflowDefinition[injectable.name],injectable.interpolationPolicy); break;
                 }
                 args.push(arg)
             })
@@ -151,7 +166,7 @@ var workflow = {
             initializeContext(context)
             var decorated = wfInstance(context)
             debug("preparing: %s", getStepName(workflowDefinition))
-            
+
 
             var markWorkflowTerminate = function(done) {
                 context.completionStack = context.completionStack || []
@@ -161,15 +176,15 @@ var workflow = {
                 }
             }
 
-            
+
             return function execute(done) {
+                var wfStartTime = new Date().getTime()
 
-
                 if (!checkCondition(context))
                     return done()
-                
+
                 markWorkflowTerminate(done)
-                
+
                 function invokeDecorated(err, res, next) {
                     function createExecutionThisContext() {
                         return {
@@ -187,7 +202,7 @@ var workflow = {
                             }
                         }
                     }
-                    
+
                     var args = getArgumentsFromAnnotations(context, decorated, wfInstance)
                     args.push(next)
                     try {
@@ -202,7 +217,7 @@ var workflow = {
                     var errorWfDef = context.get(workflowDefinition.onError);
                     var errorWf = workflow.define(errorWfDef);
                     context.error = err;
-                    errorWf(context, function(errHandlerErr, errRes) { 
+                    errorWf(context, function(errHandlerErr, errRes) {
                         if (errorWfDef.handleError) err = errHandlerErr;
                         next(err, res);
                     })
@@ -225,14 +240,14 @@ var workflow = {
                     }
                     next(err, result)
                 }
-                
+
                 function setWorkflowResultTo(err, result, next) {
                     if (err) { return next(err, result) }
                     process.env.WSDEBUGPARAMS && debug("...result is", result)
                     context.set(workflowDefinition.resultTo, result)
                     next(err, result)
                 }
-                
+
                 function buildUpMicroworkflow() {
                     var tasks = [invokeDecorated];
                     workflowDefinition.onError && tasks.push(onError)
@@ -243,56 +258,34 @@ var workflow = {
                 }
 
                 var tasks = buildUpMicroworkflow();
-                
+
                 function executeNextThunkOrComplete(err, res) {
                     var thunk = tasks.shift();
                     if (thunk) {
                         return thunk( err, res, executeNextThunkOrComplete)
                     }
-                    
+
                     debug("Finished executing WF %s", getStepName(workflowDefinition))
+                    if (context.$$$stats) {
+                      context.$$$stats.push(getStepName(workflowDefinition) + " execution time: " + (new Date().getTime() - wfStartTime) +"ms")
+                    }
                     var originalDone = context.originalTerminate || done;
                     var donePosition = context.completionStack.indexOf(originalDone);
                     context.completionStack.splice(donePosition, 1)
-                    done(err, res, context)
+                    setImmediate(function() {
+                        done(err, res, context)
+                    })
                 }
-                
+
                 debug("Executing WF %s", getStepName(workflowDefinition))
                 return executeNextThunkOrComplete()
-
-            }
-        }
-    },
-
-    readContextPath: function (context, path) {
-        path = path.replace(/\[/g, ".").replace(/\]/g, "")
-        var parts = path.split('.');
-        var data = context;
-        var part;
 
-        while (part = parts.shift()) {
-            data = data[part];
-            if (data === undefined) {
-                return undefined;
             }
         }
-
-        return data;
     },
 
-    readValue: function (pathOrValue, context) {
-        if ("@" == pathOrValue) return context;
-
-        if ("string" === typeof pathOrValue && pathOrValue[0] == '@') {
-            return module.exports.readContextPath(context, pathOrValue.slice(1))
-        }
-
-        if ("object" === typeof pathOrValue && "template" in pathOrValue) {
-            var template = pathOrValue.template;
-            var compiled = handlebars.compile(template);
-            return compiled(context);
-        }
-        return pathOrValue;
+    readValue: function(pathOrValue, context, interpolationPolicy) {
+        return interpolate(context, pathOrValue, interpolationPolicy)
     },
 
     setValue: function (object, path, value) {
@@ -313,6 +306,6 @@ var workflow = {
 }
 
 
-_.extend(wfLoader, workflow);
+_.assignIn(wfLoader, workflow);
 
 module.exports = wfLoader;