react 0.6.0 → 0.7.0

package/lib/task.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global define:true */
 
 if (typeof define !== 'function') {
@@ -11,15 +10,16 @@ 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,
     promise: PromiseTask,
     when: WhenTask
-    };
+  };
 
-    var DEFAULT_TASK_NAME = 'task_%s';  // for unnamed tasks use task_idx, like task_0
+  var DEFAULT_TASK_NAME = 'task_%s';  // for unnamed tasks use task_idx, like task_0
 
   function taskTypeKeys() { return Object.keys(TASK_TYPES); }
 
@@ -35,9 +35,6 @@ function (util, sprintf, array, CbTask, PromiseTask,
   var TASK_TYPE_SHOULD_MATCH = 'task.type should match one of ' +
     Object.keys(TASK_TYPES).join(', ');
 
-    var validateTaskType, validateTask, create;
-
-
   function format_error(errmsg, obj) {
     return sprintf('%s - %s', errmsg, util.inspect(obj));
   }
@@ -49,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;
@@ -68,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;
   }
 
@@ -102,30 +99,30 @@ function (util, sprintf, array, CbTask, PromiseTask,
     setMissingOutTaskType(taskDef);
     var taskCons = OUT_TASK_TYPES[taskDef.type];
     errors = errors.concat(taskCons.validate(taskDef));
-    return errors;  
-  }
-
-
-    function validateLocalFunctions(inParams, taskDefs, locals) {
-      var errors = [];
-      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);
-      var tasksWFunctions = tasks.filter(function (t) { return (t.type !== 'when'); }); // non-when tasks need f
-      tasksWFunctions.forEach(function (t, idx) {
-        if (!t.functionExists(vCon)) {   // error if function doesnt exist AND
-          if (!t.isMethodCall()) errors.push(sprintf(LOCAL_FN_MISSING, t.f, idx)); // not method OR
-          else {
-            var obj = t.getMethodObj(vCon);
-            if (obj && obj !== foo) {  // (has parent but not our mock)
-              errors.push(sprintf(LOCAL_FN_MISSING, t.f, idx));
-            }
+    return errors;
+  }
+
+
+  function validateLocalFunctions(inParams, taskDefs, locals) {
+    var errors = [];
+    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);
+    var tasksWFunctions = tasks.filter(function (t) { return (t.type !== 'when'); }); // non-when tasks need f
+    tasksWFunctions.forEach(function (t, idx) {
+      if (!t.functionExists(vCon)) {   // error if function doesnt exist AND
+        if (!t.isMethodCall()) errors.push(sprintf(LOCAL_FN_MISSING, t.f, idx)); // not method OR
+        else {
+          var obj = t.getMethodObj(vCon);
+          if (obj && obj !== foo) {  // (has parent but not our mock)
+            errors.push(sprintf(LOCAL_FN_MISSING, t.f, idx));
           }
         }
-      });
-      return errors;
-    }
+      }
+    });
+    return errors;
+  }
 
   function fName(fn) {
     if (typeof(fn) === 'function') {
@@ -155,7 +152,7 @@ function (util, sprintf, array, CbTask, PromiseTask,
           name = sprintf('%s_%s', name, idx); //if empty or already used, postfix with _idx
         }
         t.name = name;
-          namesMap[name] = t;
+        namesMap[name] = t;
       }
     });
     return namesMap;
@@ -168,20 +165,20 @@ function (util, sprintf, array, CbTask, PromiseTask,
 
   function createOutTask(taskDef, cbFunc, tasks, vCon, execOptions, env) {
     setMissingOutTaskType(taskDef);
-      var outTaskOptions = {
-        taskDef: taskDef,
-        cbFunc: cbFunc,
-        tasks: tasks,
-        vCon: vCon,
-        execOptions: execOptions,
-        env: env,
-        TaskConstructor: OUT_TASK_TYPES[taskDef.type]
-      };
+    var outTaskOptions = {
+      taskDef: taskDef,
+      cbFunc: cbFunc,
+      tasks: tasks,
+      vCon: vCon,
+      execOptions: execOptions,
+      env: env,
+      TaskConstructor: OUT_TASK_TYPES[taskDef.type]
+    };
     EventManager.global.emit(EventManager.TYPES.EXEC_OUTTASK_CREATE, outTaskOptions); // hook
     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;
@@ -199,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); });
   }
 
   /**
@@ -230,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;
   }
 
@@ -251,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;
   };
 
   /**
@@ -49,9 +62,9 @@ define([], function () {
   };
 
   VContext.prototype.setVar = function (name, value) { //name might be simple or obj.prop
-      if (!name) return;  // if name is undefined or null, then discard
-      var vConValues = this.values;
-      var nameAndProps = name.split('.');
+    if (!name) return;  // if name is undefined or null, then discard
+    var vConValues = this.values;
+    var nameAndProps = name.split('.');
     var lastProp = nameAndProps.pop();
     var obj = nameAndProps.reduce(function (accObj, prop) {
       var o = accObj[prop];
@@ -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;
 
-});  
+});

package/lib/when-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';
+
   /**
      When task which checks if is a promise (has a then method)
      and waits for it to resolve.
@@ -30,19 +30,18 @@ define(['util', './sprintf', './base-task'], function (util, sprintf, BaseTask)
   WhenTask.prototype = new BaseTask();
   WhenTask.prototype.constructor = WhenTask;
 
-  WhenTask.prototype.f = function when() { // just here to keep validations happy 
-  }
+  WhenTask.prototype.f = function when() { }; // just here to keep validations happy
 
   WhenTask.validate = function (taskDef) {
     var errors = [];
     if (!taskDef.a || !taskDef.out) {
       errors.push(format_error(REQ, taskDef));
     } else {
-      if (! (Array.isArray(taskDef.a) && taskDef.a.length === 1 && 
+      if (! (Array.isArray(taskDef.a) && taskDef.a.length === 1 &&
              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));
       }
@@ -77,9 +76,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 WhenTask;
 
-});  
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a javascript module implementing a lightweight rules engine to make it easier to work with asynchronous code, by reducing boilerplate code and improving error and exception handling while allowing variable and task dependencies when defining flow.",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "author": "Jeff Barczewski <jeff.barczewski@gmail.com>",
   "repository": { "type": "git", "url": "http://github.com/jeffbski/react.git" },
   "bugs" : { "url": "http://github.com/jeffbski/react/issues" },
@@ -9,16 +9,15 @@
   "main": "lib/react",
   "engines": { "node": ">=0.6" },
   "dependencies": {
-    "amdefine": "~0.0.2",
-    "eventemitter2": "~0.4.1",
-    "sprint": "~0.3.0",
+    "amdefine": "~0.0.5",
+    "eventemitter2": "~0.4.11",
     "ensure-array": "~0.0.5"
   },
   "devDependencies": {
-    "requirejs": "~1.0.7",
-    "mocha": "~0.14.1",
-    "chai": "~0.5.2",
-    "jake": "~0.2.31",
+    "requirejs": "~2.1.6",
+    "mocha": "~1.10.0",
+    "chai": "~1.6.0",
+    "jake": "~0.5.15",
     "Deferred" : "~0.1.1"
   },
   "scripts": {

package/test/ast.mocha.js

@@ -1,4 +1,3 @@
-'use strict';
 /*global react:true */
 
 if (typeof(chai) === 'undefined') {
@@ -10,6 +9,7 @@ if (typeof(react) === 'undefined') {
 }
 
 (function () {
+  'use strict';
 
   var t = chai.assert;
 
@@ -57,7 +57,7 @@ if (typeof(react) === 'undefined') {
     var fn = react();
     var collector = react.createEventCollector();
     collector.capture(fn, 'ast.*');
-    
+
     var errors = fn.setAndValidateAST({
       inParams: ['res', 'prefstr', 'poststr'],
       tasks: [
@@ -80,7 +80,7 @@ if (typeof(react) === 'undefined') {
 
   test('ast.defined event is passed to process', function (done) {
     // browser might not have this, so only if process is an eventemitter
-    if (process && process.once) {
+    if (typeof process !== 'undefined' && process && process.once) {
       var fn = react();
       process.once('ast.defined', function (ast) {
         t.isObject(ast);
@@ -99,7 +99,7 @@ if (typeof(react) === 'undefined') {
           { f: postfix, a: ['plres', 'poststr'], out: ['plresp'] }
         ],
         outTask: { a: ['plresp'] }
-      });      
+      });
     } else {
       done(); //skipping in browser
     }