react 0.2.4 → 0.2.5

package/README.md

@@ -242,7 +242,7 @@ fn(2, 3, function (err, m, s) {
 
 ## Status
 
- - 2012-01-11 - Provide warning/error when name is skipped in default DSL (v0.2.4)
+ - 2012-01-11 - Provide warning/error when name is skipped in default DSL, literal check in validate (v0.2.5)
  - 2012-01-10 - Create default DSL for react(), create error for missing variables, list remaining tasks when flow won't complete
  - 2011-12-21 - Refactor from ground up with tests, changes to the interfaces
  - 2011-10-26 - React is in active development and interface may change frequently in these early stages. Current code is functional but does not perform validation yet.  Additional interfaces are planned to make it easy to define flows in a variety of ways. Documentation and examples forthcoming.
@@ -254,7 +254,7 @@ ok ast.test.js .................... 10/10
 ok cb-task.test.js ................ 31/31
 ok chain.test.js .................. 56/56
 ok core.test.js ................... 98/98
-ok dsl.test.js .................... 58/58
+ok dsl.test.js .................... 63/63
 ok event-manager.test.js .......... 13/13
 ok exec-options.test.js ............. 3/3
 ok finalcb-task.test.js ............. 5/5
@@ -266,9 +266,9 @@ ok ret-task.test.js ............... 31/31
 ok task.test.js ..................... 1/1
 ok validate-cb-task.test.js ......... 6/6
 ok validate-ret-task.test.js ........ 7/7
-ok validate.test.js ............... 26/26
+ok validate.test.js ............... 31/31
 ok vcon.test.js ................... 42/42
-total ........................... 613/613
+total ........................... 623/623
 
 ok
 ```

package/lib/.#event-manager.js

@@ -0,0 +1 @@
+barczewskij@ELSSTLM-184670.local.99357

package/lib/core.js

@@ -13,10 +13,10 @@ var inputParser = require('./input-parser.js');
 var idGenerator = require('./id.js');
 
 var reactOptions = {
-  stackTraceLimitMin: 30  
+  stackTraceLimitMin: 30
 };
 
-var reactEmitter = EventManager.create(); // the top emitter
+var reactEmitter = EventManager.globalEventManager; // the top emitter
 
 /**
    Creates react function which the AST can be manipulated and then
@@ -39,7 +39,7 @@ var reactEmitter = EventManager.create(); // the top emitter
  */
 function reactFactory() {
   if (arguments.length) throw new Error('react() takes no args, check API');
-  
+
   error.ensureStackTraceLimitSet(reactOptions.stackTraceLimitMin);
   var flowEmitter = EventManager.create();
   flowEmitter.parent = reactEmitter;
@@ -75,7 +75,7 @@ function reactFactory() {
       if (outTask.isReady()) return outTask.exec(); // all tasks done, exec cb, return
       tskutil.findReadyAndExec(vCon, tasks, tasksByName, handleError, contExec);  //exec tasks that ready to run
     }
-    
+
     tasks.forEach(function (t) {
       t.id = idGenerator.createUniqueId();
       t.flowEmitter = flowEmitter;

package/lib/event-manager.js

@@ -54,4 +54,5 @@ EventManager.prototype.emitObject = function (event, object) {
 };
 
 module.exports = EventManager;
-module.exports.TYPES = TYPES;
+module.exports.TYPES = TYPES;
+module.exports.globalEventManager = EventManager.create(); // create one top level emitter

package/lib/validate.js

@@ -13,6 +13,9 @@ var LOCALS_NOTNULL = 'ast.locals should not be null';
 var DUP_OUTPUTS = 'multiple tasks output the same param, must be unique. param';
 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)
+var LITERAL_OR_PROP_RE = /^(true|false|\-?[0-9\.]+)$|'|"|\./i;  
+
 var validateInParams, validateTasks, validateOutTask, validateTaskNamesUnique;
 var validateLocals, validateOuputsUnique, validateNoMissingNames;
 
@@ -20,10 +23,15 @@ function format_error(errmsg, obj) {
   return sprintf('%s - %s', errmsg, util.inspect(obj));
 }
 
-function isProp(str) { // true if is a property name (contains a dot)
-  return (str.indexOf('.') !== -1);
+/**
+   true if is a literal name
+  */
+function isLiteralOrProp(name) {  // need to match what is in vcon.js, TODO consolidate?
+  return LITERAL_OR_PROP_RE.test(name);
 }
 
+
+
 /**
    validate the AST return Errors
    @example
@@ -105,6 +113,7 @@ function validateOuputsUnique(taskDefs) {
   return errors;
 }
 
+
 /**
    validate there are no missing or mispelled param names in any task inputs
    or the final task output
@@ -134,14 +143,14 @@ function validateNoMissingNames(ast) {
   // now we have all possible provided vars, check task inputs are accounted for
   ast.tasks.reduce(function (accum, t) {  // for all tasks
     return t.a.reduce(function (innerAccum, p) { // for all in params, except property
-      if (!isProp(p) && !names[p]) innerAccum.push(sprintf(MISSING_INPUTS, p)); // add error if missing
+      if (!isLiteralOrProp(p) && !names[p]) innerAccum.push(sprintf(MISSING_INPUTS, p)); // add error if missing
       return innerAccum;
     }, accum);
   }, errors);
 
   // now check the final task outputs
   ast.outTask.a.reduce(function (accum, p) { // for final task out params
-    if (!isProp(p) && !names[p]) accum.push(sprintf(MISSING_INPUTS, p)); // add error if missing
+    if (!isLiteralOrProp(p) && !names[p]) accum.push(sprintf(MISSING_INPUTS, p)); // add error if missing
     return accum;
   }, errors);
   return errors;

package/lib/vcon.js

@@ -9,9 +9,11 @@ VContext.prototype.getLastResults = function () { return this.getVar(LAST_RESULT
 VContext.prototype.setLastResults = function (args) { this.setVar(LAST_RESULTS_KEY, args); };
 
 VContext.prototype.getVar = function (name) { //name might be simple or obj.prop, also literals
+  /*jshint regexp: false */
   var vConValues = this.values;
   if (typeof(name) !== 'string') return name; // literal boolean or number
   name = name.trim();
+  // literal checks need to match what is in validate.js
   if (name === 'true') return true;
   if (name === 'false') return false;
   if (/^-?[0-9]+$/.test(name)) return parseInt(name, 10); //int

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a javascript module 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.2.4",
+  "version": "0.2.5",
   "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" },

package/test/validate.test.js

@@ -263,4 +263,30 @@ test('missing or mispelled final output variables', function (t) {
   ];
   t.deepEqual(validate(ast), messages);  
   t.end();  
-});
+});
+
+test('missing or mispelled validation ignores properties', function (t) {
+  var ast = {
+    inParams: ['obj'], 
+    tasks: [
+      { f: foo, a: ['obj.foo'], out: [] },
+      { f: bar, a: ['obj.bar'], out: [] }
+    ], 
+    outTask: { a: ['obj.cat'] }
+  };
+  t.deepEqual(validate(ast), []);  
+  t.end();  
+});
+
+test('missing or mispelled validation ignores literals', function (t) {
+  var ast = {
+    inParams: [], 
+    tasks: [
+      { f: foo, a: ['true', 'false', '123', '123.1'], out: [] },
+      { f: bar, a: ['-123', '-123.4', '"wow"', "'hey'"], out: [] }
+    ], 
+    outTask: { a: [] }
+  };
+  t.deepEqual(validate(ast), []);  
+  t.end();  
+});