react 0.2.5 → 0.2.6

package/README.md

@@ -252,23 +252,23 @@ fn(2, 3, function (err, m, s) {
 ```bash
 ok ast.test.js .................... 10/10
 ok cb-task.test.js ................ 31/31
-ok chain.test.js .................. 56/56
+ok chain.test.js .................. 59/59
 ok core.test.js ................... 98/98
 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
-ok fstr.test.js ................... 64/64
+ok fstr.test.js ................... 67/67
 ok input-parser.test.js ........... 15/15
 ok module-use.test.js ............. 64/64
-ok pcode.test.js .................. 65/65
+ok pcode.test.js .................. 68/68
 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 ............... 31/31
 ok vcon.test.js ................... 42/42
-total ........................... 623/623
+total ........................... 632/632
 
 ok
 ```

package/lib/fstr.js

@@ -1,4 +1,5 @@
 'use strict';
+/*jshint regexp: false */
 
 var sprintf = require('sprintf').sprintf;
 var core = require('./core.js');
@@ -10,14 +11,22 @@ var OUTPARAMS_NO_MATCH = 'output params in wrong format, wanted "foo, bar" - fou
 var INOUT_PARAMS_NO_MATCH = 'task params in wrong format, wanted "foo, bar -> err, baz" - found: %s';
 var EXTRA_TASKARG = 'extra unmatched task arg: %s';
 
+var ERR_NAMES_RE = /^err$/i; // err, ERR, Err, ...
+
+function filterOutLeadingErrParam(args) { // if leading err param, filter it out
+  if (args.length && args[0].match(ERR_NAMES_RE)) args.shift();
+  return args;
+}
+
+
 var inOutDefParse = {
-  regex: /^([^-]*)(->)?\s*(er{0,2}\s*,|returns?\s+)?(.*)$/i,
+  regex: /^([^\-]*)(->)?\s*(returns?\s+)?(.*)$/i,
   fn: function (m) {
     var reMatchReturns = /returns?/i;
     return {
       type: (m[3] && m[3].match(reMatchReturns)) ? 'ret' : 'cb',
       inDef: parse.splitTrimFilterArgs(m[1]),
-      outDef: parse.splitTrimFilterArgs(m[4])
+      outDef: filterOutLeadingErrParam(parse.splitTrimFilterArgs(m[4]))
     };
   }
 };

package/lib/pcode.js

@@ -1,4 +1,5 @@
 'use strict';
+/*jshint regexp: false */
 
 var sprintf = require('sprintf').sprintf;
 var core = require('./core.js');
@@ -10,6 +11,14 @@ var OUTPARAMS_NO_MATCH = 'output params in wrong format, wanted "cb(err, foo)" -
 var INOUT_PARAMS_NO_MATCH = 'task params in wrong format, wanted "foo, bar := func(baz, cat, cb) " - found: %s';
 var EXTRA_TASKARG = 'extra unmatched task arg: %s';
 
+var ERR_NAMES_RE = /^err$/i; // err, ERR, Err, ...
+
+function filterOutLeadingErrParam(args) { // if leading err param, filter it out
+  if (args.length && args[0].match(ERR_NAMES_RE)) args.shift();
+  return args;
+}
+
+
 /**
   Examples:
   var react = require('react');
@@ -82,10 +91,10 @@ var retParse = {
 };
 
 var finalCbParse = {
-  regex: /^\s*(cb|callback)\s*\((er{0,2}\s*,\s*)?([^)]*)\)\s*;?$/i,
+  regex: /^\s*(cb|callback)\s*\(([^)]*)\)\s*;?$/i,
   fn: function (m) {
     return {
-      outDef: (m[3]) ? parse.splitTrimFilterArgs(m[3]) : []
+      outDef: (m[2]) ? filterOutLeadingErrParam(parse.splitTrimFilterArgs(m[2])) : []
     };
   }
 };

package/lib/validate.js

@@ -153,7 +153,7 @@ function validateNoMissingNames(ast) {
     if (!isLiteralOrProp(p) && !names[p]) accum.push(sprintf(MISSING_INPUTS, p)); // add error if missing
     return accum;
   }, errors);
-  return errors;
+  return errors;  //TODO reenable
 }
 
 module.exports = validate;

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.5",
+  "version": "0.2.6",
   "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/chain.test.js

@@ -75,6 +75,19 @@ test('single task, single out params', function (t) {
   t.end();  
 });
 
+test('single task, err params', function (t) {
+  var fn = chainDefine()
+    .out('err')
+    .async(falpha).in().out('err', 'c')
+    .end();
+  t.deepEqual(fn.ast.inParams, []);
+  t.deepEqual(fn.ast.tasks, [
+    { f: falpha, type: 'cb', a: [], out: ['c'], name: 'falpha' }
+  ]);
+  t.deepEqual(fn.ast.outTask, { a: [], type: 'finalcb' });
+  t.end();  
+});
+
 test('single task, err and out params', function (t) {
   var fn = chainDefine()
     .out('err', 'c')

package/test/fstr.test.js

@@ -59,6 +59,18 @@ test('single task, single out params', function (t) {
   t.end();  
 });
 
+test('single task, err params', function (t) {
+  var r = fstrDefine('a, b', [
+    falpha, 'a, b -> err, c'
+  ], 'err');
+  t.deepEqual(r.ast.inParams, ['a', 'b']);
+  t.deepEqual(r.ast.tasks, [
+    { f: falpha, a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'}
+  ]);
+  t.deepEqual(r.ast.outTask, { a: [], type: 'finalcb' });
+  t.end();  
+});
+
 test('single task, err and out params', function (t) {
   var r = fstrDefine('a, b', [
     falpha, 'a, b -> err, c'

package/test/pcode.test.js

@@ -62,6 +62,20 @@ test('single task, single out params', function (t) {
   t.end();  
 });
 
+test('single task, single out params, cb(err)', function (t) {
+  var locals = { falpha: falpha };
+  var r = pcode('a, b', [
+    'c := falpha(a, b)',
+    'cb(err)'
+  ], locals);
+  t.deepEqual(r.ast.inParams, ['a', 'b']);
+  t.deepEqual(r.ast.tasks, [
+    { f: 'falpha', a: ['a', 'b'], out: ['c'], type: 'cb', name: 'falpha'}
+  ]);
+  t.deepEqual(r.ast.outTask, { a: [], type: 'finalcb' });
+  t.end();  
+});
+
 test('single task, err and out params', function (t) {
   var locals = { falpha: falpha };
   var r = pcode('a, b', [

package/test/validate.test.js

@@ -290,3 +290,4 @@ test('missing or mispelled validation ignores literals', function (t) {
   t.deepEqual(validate(ast), []);  
   t.end();  
 });
+

package/lib/.#event-manager.js

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