react 0.6.3 → 0.7.0

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,6 +5,7 @@ if (typeof define !== 'function') {
 }
 
 define(['util'], function (util) { // TODO replace util.inspect with something portable to browser
+  'use strict';
 
   var 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,6 +6,7 @@ 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
 

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
   };
 
-});  
+});

package/lib/track-tasks.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';
+
   /**
      Track the tasks, start, complete, args, results, elapsed time
      Emits events that can be monitored
@@ -69,6 +69,6 @@ define([], function () {
 
   }
 
-  return trackTasks; 
+  return trackTasks;
 
-});  
+});

package/lib/validate.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -6,8 +5,9 @@ if (typeof define !== 'function') {
 }
 
 define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf, array, taskUtil) {
+  'use strict';
   /*jshint latedef:false */
-  
+
   var AST_IS_OBJECT = 'ast must be an object with inParams, tasks, and outTask';
   var INPARAMS_ARR_STR = 'ast.inParams must be an array of strings';
   var TASKS_ARR = 'ast.tasks must be an array of tasks';
@@ -17,7 +17,7 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
   var MISSING_INPUTS = 'missing or mispelled variable referenced in flow definition: %s';
 
   // match any of our literals true, false, int, float, quoted strings, or is property (has dot), match vcon.js
-  var LITERAL_OR_PROP_RE = /^(true|false|this|null|\-?[0-9\.]+)$|'|"|\./i;  
+  var LITERAL_OR_PROP_RE = /^(true|false|this|null|\-?[0-9\.]+)$|'|"|\./i;
 
   function format_error(errmsg, obj) {
     return sprintf('%s - %s', errmsg, util.inspect(obj));
@@ -73,11 +73,11 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
     tasks.forEach(function (t) {
       errors = errors.concat(taskUtil.validate(t));
     });
-      return errors;
+    return errors;
   }
 
   function validateTaskNamesUnique(tasks) {
-      if (!Array.isArray(tasks)) return [];
+    if (!Array.isArray(tasks)) return [];
     var errors = [];
     var namedTasks = tasks.filter(function (t) { return (t.name); });
     var names = namedTasks.map(function (t) { return t.name; });
@@ -85,7 +85,7 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
       if (accum[name]) errors.push(sprintf('%s %s', NAMES_UNIQUE, name));
       else accum[name] = true;
       return accum;
-    }, {});                             
+    }, {});
     return errors;
   }
 
@@ -151,9 +151,9 @@ define(['util', './sprintf', 'ensure-array', './task'], function (util, sprintf,
       if (!isLiteralOrProp(p) && !names[p]) accum.push(sprintf(MISSING_INPUTS, p)); // add error if missing
       return accum;
     }, errors);
-    return errors;  
+    return errors;
   }
 
   return validate;
 
-});  
+});

package/lib/vcon.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 LAST_RESULTS_KEY = ':LAST_RESULTS';
 
   function VContext() {
@@ -29,10 +29,23 @@ define([], function () {
     var m = /^("|')([^\1]*)\1$/.exec(name);  //check for quoted string " or '
     if (m) return m[2]; // if is quoted str, return inside of the quotes
     var nameAndProps = name.split('.');
-    return nameAndProps.reduce(function (accObj, prop) {
+    var result = this.resolveNameArr(nameAndProps);
+    return result;
+  };
+
+  VContext.prototype.resolveNameArr = function (nameAndProps) {
+    var vConValues = this.values;
+    var result = nameAndProps.reduce(function (accObj, prop) {
       if (accObj === undefined || accObj === null) return undefined; // prevent exception
       return accObj[prop];
     }, vConValues);   // vCon['foo']['bar']
+    if (result === undefined && this.global !== undefined) { // see if matches any global
+      result = nameAndProps.reduce(function (accObj, prop) {
+        if (accObj === undefined || accObj === null) return undefined; // prevent exception
+        return accObj[prop];
+      }, this.global);   // global['foo']['bar']
+    }
+    return result;
   };
 
   /**
@@ -62,7 +75,7 @@ define([], function () {
     }, vConValues);   // vCon['foo']['bar']
     obj[lastProp] = value;
   };
-  
+
 
   /**
      Create Variable Context using arguments passed in.
@@ -72,6 +85,7 @@ define([], function () {
        @param self used to pass 'this' context in
   */
   VContext.create = function (args, inParams, locals, self) {
+    /*jshint validthis:true, evil:true */
     var initValues = {};
     if (self) initValues['this'] = self;
     if (locals) Object.keys(locals).forEach(function (k) { initValues[k] = locals[k]; }); // copy over keys
@@ -81,10 +95,19 @@ define([], function () {
       if (param) vcon[param] = (x !== undefined) ? x : null; // upgrade undefined to null
       return vcon;
     }, initValues);
+
+    // add in global
+    if (typeof global === 'object') { // node.js and modern browsers expose global
+      vContext.global = global;
+    } else { // try to access this using Function eval of this
+      // http://stackoverflow.com/questions/3277182/how-to-get-the-global-object-in-javascript
+      vContext.global = new Function('return this')();
+    }
+
     return vContext;
   };
 
 
   return VContext;
 
-});  
+});