react 0.6.1 → 0.7.1

package/lib/finalcb-task.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -7,12 +6,13 @@ if (typeof define !== 'function') {
 
 define(['./sprintf', 'util', './status', './event-manager'],
        function (sprintf, util, STATUS, EventManager) {
+  'use strict';
 
   var OUTTASK_A_REQ = 'ast.outTask.a should be an array of string param names';
 
   function FinalCbTask(outTaskOptions) {
-      var taskDef = outTaskOptions.taskDef;
-    if (typeof(outTaskOptions.cbFunc) !== 'function') throw new Error('callback is not a function'); 
+    var taskDef = outTaskOptions.taskDef;
+    if (typeof(outTaskOptions.cbFunc) !== 'function') throw new Error('callback is not a function');
     var self = this;
     for (var k in taskDef) {
       if (true) self[k] = taskDef[k];  // if to make jshint happy
@@ -62,4 +62,4 @@ define(['./sprintf', 'util', './status', './event-manager'],
 
   return FinalCbTask;
 
-});  
+});

package/lib/id.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,7 +5,8 @@ if (typeof define !== 'function') {
 }
 
 define([], function () {
-  
+  'use strict';
+
   var startingId = 0;
 
   function createUniqueId() {
@@ -19,4 +19,4 @@ define([], function () {
     createUniqueId: createUniqueId
   };
 
-});  
+});

package/lib/input-parser.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,16 +5,17 @@ if (typeof define !== 'function') {
 }
 
 define(['./event-manager'], function (EventManager) {
+  'use strict';
 
   var defaultExecOptions = {
     reactExecOptions: true,
     outputStyle: 'cb',
   };
 
-    var OUTPUT_STYLES = {
-      CALLBACK: 'cb',
-      NONE: 'none'
-    };
+  var OUTPUT_STYLES = {
+    CALLBACK: 'cb',
+    NONE: 'none'
+  };
 
   function isExecOptions(x) { return (x && x.reactExecOptions); }
   function execOptionsFilter(x) { return isExecOptions(x); }
@@ -31,16 +31,16 @@ define(['./event-manager'], function (EventManager) {
     if (style === OUTPUT_STYLES.CALLBACK && args.length) result.cb = args.shift(); // next take the cb
     result.extra = args; // these remaining were after the callback
     return result;
-    }
-    
+  }
+
   function inputParser(inputArgs, ast) {
     var parsedInput = { };
     var execOptionsArr = inputArgs.filter(execOptionsFilter);
     execOptionsArr.unshift(defaultExecOptions);
     parsedInput.options = execOptionsArr.reduce(mergeExecOptions, {});
 
-      var args = inputArgs.filter(nonExecOptionsFilter);
-    var splitResult = splitArgs(args, ast.inParams, parsedInput.options.outputStyle); 
+    var args = inputArgs.filter(nonExecOptionsFilter);
+    var splitResult = splitArgs(args, ast.inParams, parsedInput.options.outputStyle);
     parsedInput.args = splitResult.args;
     parsedInput.cb = splitResult.cb;
     if (splitResult.outputStyle) parsedInput.options.outputStyle = splitResult.outputStyle;
@@ -53,4 +53,4 @@ define(['./event-manager'], function (EventManager) {
   inputParser.defaultExecOptions = defaultExecOptions;
   return inputParser;
 
-});  
+});

package/lib/log-events.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,9 +5,10 @@ if (typeof define !== 'function') {
 }
 
 define(['util'], function (util) { // TODO replace util.inspect with something portable to browser
+  'use strict';
 
   var logEventsMod = { };
-  
+
   /**
      Log events to console.error
 
@@ -20,31 +20,31 @@ define(['util'], function (util) { // TODO replace util.inspect with something p
      react.logEvents(flowFn, 'flow.*'); // log all flow events on flowFn only
     */
 
-    var ALL_FLOW_EVENTS = 'flow.*';
+  var ALL_FLOW_EVENTS = 'flow.*';
   var ALL_TASK_EVENTS = 'task.*';
   var FLOW_RE = /^flow\./;
 
   function flowLog(obj) {
     /*jshint validthis: true */
     var time = new Date();
-      time.setTime(obj.time);
+    time.setTime(obj.startTime);
     var argsNoCb = obj.args.filter(function (a) { return (typeof(a) !== 'function'); });
     var eventTimeStr = time.toISOString();
     if (this.event === 'flow.complete') {
-      var env = obj; 
+      var env = obj;
       console.error('%s: %s \tmsecs: %s \n\targs: %s \n\tresults: %s\n',
-                    this.event, env.name, env.elapsedTime, util.inspect(argsNoCb), util.inspect(env.results));   
+                    this.event, env.name, env.elapsedTime, util.inspect(argsNoCb), util.inspect(env.results));
     } else {
       var name = obj.name;
       var args = obj.args;
       console.error('%s: %s \n\targs: %s\n', this.event, name, util.inspect(argsNoCb));
-    }    
+    }
   }
 
   function taskLog(obj) {
     /*jshint validthis: true */
     var time = new Date();
-    time.setTime(obj.time);
+    time.setTime(obj.startTime);
     var argsNoCb = obj.args.filter(function (a) { return (typeof(a) !== 'function'); });
     var eventTimeStr = time.toISOString();
     if (this.event === 'task.complete') {
@@ -56,37 +56,46 @@ define(['util'], function (util) { // TODO replace util.inspect with something p
       var args = obj.args;
       console.error('%s: %s:%s \n\targs: %s\n', this.event, obj.env.name, obj.name, util.inspect(argsNoCb));
     }
-    
+
   }
 
   /**
      Log flow and task events for a flowFn or all of react.
      If called multiple times, remove previous listener (if any) before
      adding.
-     
+
      @example
      var react = require('react');
      react.logEvents(flowFn, eventWildcard); //log events on flowfn matching wildcard
-     
+
      @param flowFn Flow function or global react object
      @param eventWildcard wildcarded event type, if not provided use flow.* and task.*
   */
   function logEvents(flowFn, eventWildcard) {
     if (!flowFn) throw new Error('flowFn is required');
-    if (eventWildcard && eventWildcard !== '*') {
+    if (!flowFn.events._loggingEvents) flowFn.events._loggingEvents = [];
+    if (eventWildcard === false) { // turn off logging
+      flowFn.events._loggingEvents.forEach(function (evt) {
+        flowFn.events.removeAllListeners(evt);
+      });
+      flowFn.events._loggingEvents.length = 0; // clear
+    } else if (eventWildcard && eventWildcard !== '*') {
       var logFn = (FLOW_RE.test(eventWildcard)) ? flowLog : taskLog;
       flowFn.events.removeListener(eventWildcard, logFn);
       flowFn.events.on(eventWildcard, logFn);
+      flowFn.events._loggingEvents.push(eventWildcard);
     } else { // none provided, use flow.* and task.*
       //output events as tasks start and complete
       flowFn.events.removeListener(ALL_FLOW_EVENTS, flowLog);
       flowFn.events.on(ALL_FLOW_EVENTS, flowLog);
+      flowFn.events._loggingEvents.push(ALL_FLOW_EVENTS);
       flowFn.events.removeListener(ALL_TASK_EVENTS, taskLog);
-      flowFn.events.on(ALL_TASK_EVENTS, taskLog);      
+      flowFn.events.on(ALL_TASK_EVENTS, taskLog);
+      flowFn.events._loggingEvents.push(ALL_TASK_EVENTS);
     }
   }
 
   logEventsMod.logEvents = logEvents;
   return logEventsMod;
 
-});  
+});

package/lib/parse.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,6 +5,7 @@ if (typeof define !== 'function') {
 }
 
 define(['./sprintf'], function (sprintf) {
+  'use strict';
 
   function splitTrimFilterArgs(commaSepArgs) { //parse 'one, two' into ['one', 'two']
     if (!commaSepArgs) return [];
@@ -30,7 +30,7 @@ define(['./sprintf'], function (sprintf) {
       return result;
     } else { // no match
       throw new Error(sprintf(errStr, str));
-    }  
+    }
   }
 
   return {
@@ -38,4 +38,4 @@ define(['./sprintf'], function (sprintf) {
     parseStr: parseStr
   };
 
-});  
+});

package/lib/promise-resolve.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,6 +5,7 @@ if (typeof define !== 'function') {
 }
 
 define([], function () {
+  'use strict';
 
   /**
      Auto resolve promises passed in as arguments to the flow
@@ -17,9 +17,9 @@ define([], function () {
   */
 
 
-    var PROMISE_SUFFIX = '__promise';  // added to param names that are promises
+  var PROMISE_SUFFIX = '__promise';  // added to param names that are promises
 
-    var resolvingPromises = false;
+  var resolvingPromises = false;
 
   function resolvePromises(react) {
     if (resolvingPromises) return; // already resolving
@@ -47,4 +47,4 @@ define([], function () {
 
   return resolvePromises;
 
-});  
+});

package/lib/promise-task.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,6 +5,7 @@ if (typeof define !== 'function') {
 }
 
 define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask) {
+  'use strict';
 
   /**
      PromiseTask is a task which executes a fn that returns a promise
@@ -42,7 +42,7 @@ define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask)
              taskDef.a.every(function (x) { return (typeof(x) === 'string'); }))) {
         errors.push(format_error(A_REQ, taskDef));
       }
-      if (! (Array.isArray(taskDef.out) && taskDef.out.length <= 1 && 
+      if (! (Array.isArray(taskDef.out) && taskDef.out.length <= 1 &&
              taskDef.out.every(function (x) { return (typeof(x) === 'string'); }))) {
         errors.push(format_error(OUT_REQ, taskDef));
       }
@@ -85,9 +85,9 @@ define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask)
       }
     } catch (err) { //catch and handle the task error, calling final cb
       handleError(this, err);
-    }    
+    }
   };
 
   return PromiseTask;
 
-});  
+});

package/lib/react.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -7,9 +6,10 @@ if (typeof define !== 'function') {
 
 define(['./core', './dsl', './track-tasks', './log-events', './promise-resolve', './event-collector'],
        function (core, dsl, trackTasksFn, logEventsMod, resolvePromisesFn, eventCollectorFactory) {
+  'use strict';
 
   var react = dsl; // core + default dsl
-         
+
   /**
      Enable detection of promises and resolution
     */
@@ -23,8 +23,8 @@ define(['./core', './dsl', './track-tasks', './log-events', './promise-resolve',
     */
   function trackTasks() {
     trackTasksFn(react);
-  }  
-         
+  }
+
   /**
      If called, load the built-in plugin for log events and invoke
 
@@ -32,7 +32,7 @@ define(['./core', './dsl', './track-tasks', './log-events', './promise-resolve',
      @param eventWildcard [string] pattern to log events for
   */
   function logEvents(flowFn, eventWildcard) {
-    if (!eventWildcard && typeof(flowFn) === 'string') { // only wildcard provided
+    if (typeof(flowFn) !== 'function') { // only wildcard provided
       eventWildcard = flowFn;
       flowFn = undefined;
     }
@@ -53,7 +53,7 @@ define(['./core', './dsl', './track-tasks', './log-events', './promise-resolve',
   react.logEvents = logEvents;  // enable event logging
   react.resolvePromises = resolvePromises; // enable promise resolution
   react.trackTasks = trackTasks; // enable tracking of tasks
-  react.createEventCollector = createEventCollector; // create instance of EventCollector       
+  react.createEventCollector = createEventCollector; // create instance of EventCollector
   return react;
-  
+
 });

package/lib/ret-task.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,7 +5,8 @@ if (typeof define !== 'function') {
 }
 
 define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask) {
-  
+  'use strict';
+
   function format_error(errmsg, obj) {
     return sprintf('%s - %s', errmsg, util.inspect(obj));
   }
@@ -50,7 +50,7 @@ define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask)
   RetTask.prototype.exec = function exec(vCon, handleError, contExec) {
     try {
       var args = this.a.map(function (k) { return vCon.getVar(k); }); //get args from vCon
-      this.start(args); //note the start time, args    
+      this.start(args); //note the start time, args
       var func = this.f;
       var bindObj = vCon.getVar('this'); //global space or the original this
       if (this.isMethodCall()) { //if method call then reset func and bindObj
@@ -68,4 +68,4 @@ define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask)
 
   return RetTask;
 
-});  
+});

package/lib/sprintf.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true sprint:true */
 
 if (typeof define !== 'function') {
@@ -6,13 +5,14 @@ if (typeof define !== 'function') {
 }
 
 define(['util'], function (util) {
+  'use strict';
 
   /**
      Abstract the details of getting a sprintf function.
      Currently using the simple format capabilities of node's util.format
     */
-  
+
   var sprintf = util.format;
   return sprintf;
-  
-});  
+
+});

package/lib/status.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,9 +5,10 @@ if (typeof define !== 'function') {
 }
 
 define([], function () {
-  
+  'use strict';
+
   var STATUS = { READY: 'ready',  RUNNING: 'running', ERRORED: 'errored', COMPLETE: 'complete' };
 
   return STATUS;
 
-});  
+});

package/lib/task.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -11,7 +10,8 @@ define(['util', './sprintf', 'ensure-array', './cb-task', './promise-task',
 function (util, sprintf, array, CbTask, PromiseTask,
          RetTask, WhenTask, FinalCbTask, FinalCbFirstSuccTask,
          STATUS, error, VContext, EventManager) {
-  
+  'use strict';
+
   var TASK_TYPES = {
     cb: CbTask,
     ret: RetTask,
@@ -46,13 +46,13 @@ function (util, sprintf, array, CbTask, PromiseTask,
   */
   function setMissingType(taskDef) {
     if (taskDef.type) return taskDef; //already set, return
-    taskDef.type = 'cb'; 
+    taskDef.type = 'cb';
     return taskDef;
   }
 
   function setMissingOutTaskType(taskDef) {
     if (!taskDef.type) taskDef.type = Object.keys(OUT_TASK_TYPES)[0]; //use first outTask type as default
-  } 
+  }
 
   function ensureAfterArrStrings(taskDef) { // convert any fn to str, and make sure is array
     if (!taskDef.after) return;
@@ -65,14 +65,14 @@ function (util, sprintf, array, CbTask, PromiseTask,
      @returns array of errors for taskDef, could be empty
   */
   function validate(taskDef) {
-    if (!taskDef || typeof(taskDef) !== 'object') {    
+    if (!taskDef || typeof(taskDef) !== 'object') {
       return [format_error(TASKDEF_IS_OBJECT, taskDef)];
     }
     setMissingType(taskDef);
     ensureAfterArrStrings(taskDef);
     var errors = [];
     errors = errors.concat(validateTaskType(taskDef));
-    errors = errors.concat(validateTask(taskDef));  
+    errors = errors.concat(validateTask(taskDef));
     return errors;
   }
 
@@ -99,13 +99,13 @@ function (util, sprintf, array, CbTask, PromiseTask,
     setMissingOutTaskType(taskDef);
     var taskCons = OUT_TASK_TYPES[taskDef.type];
     errors = errors.concat(taskCons.validate(taskDef));
-    return errors;  
+    return errors;
   }
 
 
   function validateLocalFunctions(inParams, taskDefs, locals) {
     var errors = [];
-    function foo() { } //used to mock args as fns for validation check 
+    function foo() { } //used to mock args as fns for validation check
     var mock_args = inParams.map(function (p) { return foo; }); //mock args with fns
     var vCon = VContext.create(mock_args, inParams, locals);
     var tasks = taskDefs.map(create);
@@ -178,7 +178,7 @@ function (util, sprintf, array, CbTask, PromiseTask,
     var TaskConstructor = outTaskOptions.TaskConstructor;  // hook could have changed
     return new TaskConstructor(outTaskOptions);
   }
-  
+
   function createErrorHandler(vCon, outTask) {
     return function handleError(task, err) {
       task.status = STATUS.ERRORED;
@@ -196,7 +196,7 @@ function (util, sprintf, array, CbTask, PromiseTask,
 
   function execTasks(tasksReady, vCon, handleError, contExec) {
     tasksReady.forEach(function (t) { t.status = STATUS.READY; }); //set ready first, no double exec
-    tasksReady.forEach(function (t) { t.exec(vCon, handleError, contExec); }); 
+    tasksReady.forEach(function (t) { t.exec(vCon, handleError, contExec); });
   }
 
   /**
@@ -227,7 +227,7 @@ function (util, sprintf, array, CbTask, PromiseTask,
 
   function serializeTasks(tasks) { // conveniently set after for each task idx > 0
     nameTasks(tasks);
-    tasks.forEach(function (t, idx, arr) { if (idx !== 0) t.after = [arr[idx - 1].name]; }); 
+    tasks.forEach(function (t, idx, arr) { if (idx !== 0) t.after = [arr[idx - 1].name]; });
     return tasks;
   }
 
@@ -248,4 +248,4 @@ function (util, sprintf, array, CbTask, PromiseTask,
     findReadyAndExec: findReadyAndExec
   };
 
-});  
+});