react 0.2.4 → 0.3.4

package/test/module-use.test.js

@@ -3,7 +3,10 @@
 var test = require('tap').test;
 var BaseTask = require('../lib/base-task.js');
 
-var react = require('../react');
+var react = require('../'); // require('react');
+// turn on tracking, optionally obtain EventCollector
+var EventCollector = require('../lib/track-tasks').EventCollector;  // require('react/lib/track-tasks'); 
+
 
 /**
   @example
@@ -35,9 +38,7 @@ var react = require('../react');
 test('module exports an function object with properties', function (t) {
   t.type(react, 'function', 'is a core constructor and default dsl function');
   t.type(react.options, 'object', 'has property for global react options');
-  t.type(react.fstrDefine, 'function', 'has fn property for using fstr dsl');
-  t.type(react.pcodeDefine, 'function', 'has fn property for using pcode dsl');
-  t.type(react.chainDefine, 'function', 'has fn property for chain define');
+  t.type(react.events, 'object', 'has global react event manager');
   t.end();
 });
 
@@ -81,6 +82,7 @@ test('use react() default DSL from module', function (t) {
     multiply, 'a, b, cb -> err, m',
     add, 'm, a, cb -> err, s'
   );
+
   
   fn(2, 3, function (err, m, s) {
     t.deepEqual(err, null, 'should not be any error');
@@ -98,10 +100,6 @@ test('use react.selectFirst() default DSL with events', function (t) {
   function noSuccessNull(a, b, cb) { cb(null, null); } // returns null result
   function add(a, b, cb) { cb(null, a + b); }
 
-  var events = [];
-  function accumEvents(task) {
-    events.push(task);
-  }
   
   var fn = react.selectFirst('mySelectFirst', 'a, b, cb -> err, c',
     noSuccess, 'a, b, cb -> err, c',
@@ -110,208 +108,24 @@ test('use react.selectFirst() default DSL with events', function (t) {
     noSuccess, 'a, b, cb -> err, c'                             
   );
 
-  fn.events.on('task.complete', accumEvents);
-  
-  fn(2, 3, function (err, c) {
-    t.deepEqual(err, null, 'should not be any error');
-    t.equal(c, 5);
-    t.equal(events.length, 3, 'should have seen two task compl events');
-    t.equal(events[0].name, 'noSuccess', 'name matches');
-    t.equal(events[1].name, 'noSuccessNull', 'name matches');
-    t.equal(events[2].name, 'add', 'name matches');
-    t.deepEqual(events[2].results, [5], 'results match');
-    t.end();
-  });
-});
-
-
-test('use pcodeDefine from module', function (t) {
-  t.plan(3);
-  function multiply(a, b, cb) { cb(null, a * b); }
-  function add(a, b, cb) { cb(null, a + b); }
-  var locals = { multiply: multiply, add: add };
-  var fn = react.pcodeDefine('a, b, cb', [
-    'm := multiply(a, b)',
-    's := add(m, a)',
-    'cb(err, m, s)'
-  ], locals);
-  
-  fn(2, 3, function (err, m, s) {
-    t.deepEqual(err, null, 'should not be any error');
-    t.equal(m, 6);
-    t.equal(s, 8);
-    t.end();
-  });
-});
-
-test('use pcodeDefine with events', function (t) {
-  t.plan(8);
-  function multiply(a, b, cb) { cb(null, a * b); }
-  function add(a, b, cb) { cb(null, a + b); }
-
-  var events = [];
-  function accumEvents(task) {
-    events.push(task);
-  }
-  
-  var locals = { multiply: multiply, add: add };
-  var fn = react.pcodeDefine('a, b, cb', [
-    'm := multiply(a, b)',
-    's := add(m, a)',
-    'cb(err, m, s)'
-  ], locals);
-
-  fn.events.on('task.complete', accumEvents);
-  
-  fn(2, 3, function (err, m, s) {
-    t.deepEqual(err, null, 'should not be any error');
-    t.equal(m, 6);
-    t.equal(s, 8);
-    t.equal(events.length, 2, 'should have seen two task compl events');
-    t.equal(events[0].name, 'multiply', 'name matches');
-    t.deepEqual(events[0].results, [6], 'results match');
-    t.equal(events[1].name, 'add', 'name matches');
-    t.deepEqual(events[1].results, [8], 'results match');
-    t.end();
-  });
-});
-
-test('use pcodeDefine.selectFirst with events', function (t) {
-  t.plan(7);
-  function noSuccess(a, b, cb) {
-    setTimeout(function () { cb(null); }, 100); // returns undefined result
-  }
-  function noSuccessNull(a, b, cb) { cb(null, null); } // returns null result
-  function add(a, b, cb) { cb(null, a + b); }
-
-  var events = [];
-  function accumEvents(task) {
-    events.push(task);
-  }
-  
-  var locals = { noSuccess: noSuccess, noSuccessNull: noSuccessNull, add: add };
-  var fn = react.pcodeDefine.selectFirst('a, b, cb', [
-    'c := noSuccess(a, b)',
-    'c := noSuccessNull(a, b)',
-    'c := add(a, b)',
-    'c := noSuccess(a, b)',    
-    'cb(err, c)'
-  ], locals);
-
-  fn.events.on('task.complete', accumEvents);
+  var collector = new EventCollector();
+  collector.capture(fn, 'task.complete');
   
   fn(2, 3, function (err, c) {
     t.deepEqual(err, null, 'should not be any error');
     t.equal(c, 5);
+    var events = collector.list();
     t.equal(events.length, 3, 'should have seen two task compl events');
-    t.equal(events[0].name, 'noSuccess', 'name matches');
-    t.equal(events[1].name, 'noSuccessNull', 'name matches');
-    t.equal(events[2].name, 'add', 'name matches');
-    t.deepEqual(events[2].results, [5], 'results match');
-    t.end();
-  });
-});
-
-test('use pcodeDefine events emit to global emitter', function (t) {
-  t.plan(8);
-  function multiply(a, b, cb) { cb(null, a * b); }
-  function add(a, b, cb) { cb(null, a + b); }
-
-  var events = [];
-  function accumEvents(task) {
-    events.push(task);
-  }
-  
-  var locals = { multiply: multiply, add: add };
-  var fn = react.pcodeDefine('a, b, cb', [
-    'm := multiply(a, b)',
-    's := add(m, a)',
-    'cb(err, m, s)'
-  ], locals);
-
-  react.events.on('task.complete', accumEvents);  // the global react emitter
-  
-  fn(2, 3, function (err, m, s) {
-    t.deepEqual(err, null, 'should not be any error');
-    t.equal(m, 6);
-    t.equal(s, 8);
-    t.equal(events.length, 2, 'should have seen two task compl events');
-    t.equal(events[0].name, 'multiply', 'name matches');
-    t.deepEqual(events[0].results, [6], 'results match');
-    t.equal(events[1].name, 'add', 'name matches');
-    t.deepEqual(events[1].results, [8], 'results match');
+    t.equal(events[0].task.name, 'noSuccess', 'name matches');
+    t.equal(events[1].task.name, 'noSuccessNull', 'name matches');
+    t.equal(events[2].task.name, 'add', 'name matches');
+    t.deepEqual(events[2].task.results, [5], 'results match');
     t.end();
   });
 });
 
 
 
-test('chainDefine use', function (t) {
-  t.plan(8);
-  function multiply(a, b, cb) { cb(null, a * b); }
-  function add(a, b, cb) { cb(null, a + b); }
-
-  var events = [];
-  function accumEvents(task) {
-    events.push(task);
-  }
-  
-  var fn = react.chainDefine()
-    .in('a', 'b', 'cb')
-    .out('err', 'm', 's')
-    .async(multiply).in('a', 'b', 'cb').out('err', 'm')
-    .async(add).in('m', 'a', 'cb').out('err', 's')
-    .end();
-
-  fn.events.on('task.complete', accumEvents);
-  
-  fn(2, 3, function (err, m, s) {
-    t.deepEqual(err, null, 'should not be any error');
-    t.equal(m, 6);
-    t.equal(s, 8);
-    t.equal(events.length, 2, 'should have seen two task compl events');
-    t.equal(events[0].name, 'multiply', 'name matches');
-    t.deepEqual(events[0].results, [6], 'results match');
-    t.equal(events[1].name, 'add', 'name matches');
-    t.deepEqual(events[1].results, [8], 'results match');
-    t.end();
-  });
-});
-
-test('use chainDefine selectFirst with events', function (t) {
-  t.plan(7);
-  function noSuccess(a, b, cb) {
-    setTimeout(function () { cb(null); }, 100); // returns undefined result
-  }
-  function noSuccessNull(a, b, cb) { cb(null, null); } // returns null result
-  function add(a, b, cb) { cb(null, a + b); }
 
-  var events = [];
-  function accumEvents(task) {
-    events.push(task);
-  }
 
-  var fn = react.chainDefine()
-    .selectFirst()
-    .in('a', 'b', 'cb')
-    .out('err', 'c')
-    .async(noSuccess).in('a', 'b', 'cb').out('err', 'c')
-    .async(noSuccessNull).in('a', 'b', 'cb').out('err', 'c')
-    .async(add).in('a', 'b', 'cb').out('err', 'c')
-    .async(noSuccess).in('a', 'b', 'cb').out('err', 'c')
-    .end();
-  
-  fn.events.on('task.complete', accumEvents);
-  
-  fn(2, 3, function (err, c) {
-    t.deepEqual(err, null, 'should not be any error');
-    t.equal(c, 5);
-    t.equal(events.length, 3, 'should have seen two task compl events');
-    t.equal(events[0].name, 'noSuccess', 'name matches');
-    t.equal(events[1].name, 'noSuccessNull', 'name matches');
-    t.equal(events[2].name, 'add', 'name matches');
-    t.deepEqual(events[2].results, [5], 'results match');
-    t.end();
-  });
-});
 

package/test/promise-auto-resolve.test.js

@@ -0,0 +1,51 @@
+'use strict';
+
+/**
+  Test that arguments which are promises are automatically resolved
+  before calling react functions
+  */
+
+var test = require('tap').test;
+var Deferred = require('promised-io/promise').Deferred;
+
+var react = require('../promise-resolve');  // require('react/promise-resolve');
+
+function multiply(x, y, cb) { cb(null, x * y); }
+function add(x, y, cb) { cb(null, x + y); }
+// function badF2(a, b, cb) { cb('my-error'); }
+
+test('auto resolve promises passed as args', function (t) {
+  t.plan(4);
+  var fn = react();
+  var errors = fn.setAndValidateAST({
+    inParams: ['a', 'b'],
+    tasks: [    
+      { f: multiply, a: ['a', 'b'], out: ['c'] },
+      { f: add, a: ['c', 'b'], out: ['d'] }
+    ],
+    outTask: { a: ['c', 'd'] }
+  });
+  t.deepEqual(errors, [], 'no validation errors');
+
+  function retAP() {
+    var deferred = new Deferred();
+    setTimeout(function () { deferred.resolve(2); }, 10);
+    return deferred.promise;
+  }
+
+  function retBP() {
+    var deferred = new Deferred();
+    setTimeout(function () { deferred.resolve(3); }, 10);
+    return deferred.promise;      
+  }
+
+  var ap = retAP();
+  var bp = retBP();
+
+  fn(ap, bp, function (err, c, d) {
+    t.equal(err, null);
+    t.equal(c, 6);
+    t.equal(d, 9);
+    t.end();
+  });
+});

package/test/validate.test.js

@@ -263,4 +263,33 @@ 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', 'null'], out: [] },
+      { f: bar, a: ['-123', '-123.4', '"wow"', "'hey'"], out: [] },
+      { f: foo, a: ['"two-words"', "'also-two'", '"two.words"', "'also.two'"], out: [] },
+      { f: foo, a: ['this'], out: [] }
+    ], 
+    outTask: { a: [] }
+  };
+  t.deepEqual(validate(ast), []);  
+  t.end();  
+});
+

package/test/vcon.test.js

@@ -67,12 +67,25 @@ test('simple getVar returns existing value', function (t) {
 test('getVar on literals returns the literal', function (t) {
   t.equal(VContext.create([], []).getVar(true), true);
   t.equal(VContext.create([], []).getVar(false), false);
+  t.equal(VContext.create([], []).getVar(null), null);  
+  t.equal(VContext.create([], []).getVar('true'), true);
+  t.equal(VContext.create([], []).getVar('false'), false);
+  t.equal(VContext.create([], []).getVar('null'), null);  
   t.equal(VContext.create([], []).getVar(-100), -100);
   t.equal(VContext.create([], []).getVar(100), 100);
   t.equal(VContext.create([], []).getVar(123.4), 123.4);
   t.equal(VContext.create([], []).getVar(-987.6), -987.6);
+  t.equal(VContext.create([], []).getVar('-100'), -100);
+  t.equal(VContext.create([], []).getVar('100'), 100);
+  t.equal(VContext.create([], []).getVar('123.4'), 123.4);
+  t.equal(VContext.create([], []).getVar('-987.6'), -987.6);
   t.equal(VContext.create([], []).getVar('"foo"'), 'foo');
   t.equal(VContext.create([], []).getVar("'foo'"), 'foo');
+  t.equal(VContext.create([], []).getVar("'foo.bar'"), 'foo.bar');
+  t.equal(VContext.create([], []).getVar("'foo-bar'"), 'foo-bar');
+  t.equal(VContext.create([], []).getVar("'foo-bar.json'"), 'foo-bar.json');
+  t.equal(VContext.create([], []).getVar('"foo-bar.json"'), 'foo-bar.json');
+  t.deepEqual(VContext.create([], [], null, { a: 1}).getVar('this'), { a: 1});
   t.end();
 });
 

package/oldExamples/analyze.js

@@ -1,29 +0,0 @@
-'use strict';
-
-function loadUser(uid, cb) { setTimeout(cb, 100, null, "User" + uid); }
-function loadFile(filename, cb) { setTimeout(cb, 100, null, 'Filedata' + filename); }
-function markdown(filedata) { return 'html' + filedata; }
-function prepareDirectory(outDirname, cb) { setTimeout(cb, 200, null, 'dircreated-' + outDirname); }
-function writeOutput(html, user, cb) {  setTimeout(cb, 300, null, html + '_bytesWritten'); }
-function loadEmailTemplate(cb) { setTimeout(cb, 50, null, 'emailmd'); }
-function customizeEmail(user, emailHtml, cb) { return 'cust-' + user + emailHtml; }
-function deliverEmail(custEmailHtml, cb) { setTimeout(cb, 100, null, 'delivered-' + custEmailHtml); }
-
-function analyze(fn) {
-  console.log(fn.toString());
-}
-
-var fn = analyze(function loadAndSend(filename, uid, outDirname, cb,
-                         R, filedata, outDirName, dircreated, emailmd, emailHtml,
-                                   custEmailHtml, deliveredEmail, err, user, html, bytesWritten) {
-  R.async(loadUser, uid).cb(err, user)
-    .async(loadFile, filename).cb(err, filedata)
-    .sync(markdown, filedata).returns(filedata)
-    .async(prepareDirectory, outDirName).cb(dircreated)
-    .async(writeOutput, html, user).cb(err, bytesWritten).after(prepareDirectory)
-    .async(loadEmailTemplate).cb(err, emailmd)
-    .sync(markdown, emailmd).returns(emailHtml)
-    .sync(customizeEmail, user, emailHtml).returns(custEmailHtml)
-    .sync(deliverEmail, custEmailHtml).returns(deliveredEmail).after(writeOutput)
-    .finalCb(err, html, user, bytesWritten);
-});

package/oldExamples/analyze2.js

@@ -1,29 +0,0 @@
-'use strict';
-
-function loadUser(uid, cb) { setTimeout(cb, 100, null, "User" + uid); }
-function loadFile(filename, cb) { setTimeout(cb, 100, null, 'Filedata' + filename); }
-function markdown(filedata) { return 'html' + filedata; }
-function prepareDirectory(outDirname, cb) { setTimeout(cb, 200, null, 'dircreated-' + outDirname); }
-function writeOutput(html, user, cb) {  setTimeout(cb, 300, null, html + '_bytesWritten'); }
-function loadEmailTemplate(cb) { setTimeout(cb, 50, null, 'emailmd'); }
-function customizeEmail(user, emailHtml, cb) { return 'cust-' + user + emailHtml; }
-function deliverEmail(custEmailHtml, cb) { setTimeout(cb, 100, null, 'delivered-' + custEmailHtml); }
-
-function react(fn) {
-  console.log(fn.toString());
-}
-
-var fn = react(function (R, filename, uid, outDirname, cb) {
-  var filedata, outDirName, dircreated, emailmd, emailHtml,
-    custEmailHtml, deliveredEmail, err, user, html, bytesWritten;
-  R.async(loadUser).in(uid).out(err, user)
-    .async(loadFile).in(filename).out(err, filedata)
-    .sync(markdown, filedata).out(filedata)
-    .async(prepareDirectory, outDirName).out(dircreated)
-    .async(writeOutput, html, user).out(err, bytesWritten).after(prepareDirectory)
-    .async(loadEmailTemplate).out(err, emailmd)
-    .sync(markdown, emailmd).out(emailHtml)
-    .sync(customizeEmail, user, emailHtml).out(custEmailHtml)
-    .sync(deliverEmail, custEmailHtml).out(deliveredEmail).after(writeOutput)
-    .cb(err, html, user, bytesWritten);
-});

package/oldExamples/example10-dsl.js

@@ -1,63 +0,0 @@
-
-
-var reactMod = require(__dirname+'/../lib/react.js'); 
-var react = reactMod.react;
-
-var r = react('allStart, titlesFile, numQueries, numFactors, cb').define(
-    openTitlesStream, 'titlesFile         -> err, fileStream', { tasks: [
-      split,          'fileStream         -> err, lineStream',
-      filterLines,    'lineStream, numQueries -> err, filteredLineStream',
-      trimLines,      'filteredLineStream -> err, trimmedLineStream',
-      recordTime,     '                   -> returns qStart', { after: trimLines },
-      runQuery,       'trimmedLineStream, numFactors -> err, qResults', { after: recordTime },
-      calcTime,       'qStart             -> returns qTime', { after: runQuery },
-      sumTotal,       'qTime              -> returns qTotal', { reduce: true }
-    ], cb:'-> err, qTotal' },
-    calcTime,         'allStart           -> returns allElapsed', { after: openTitlesStream }
-  ).callbackDef('allElapsed, qTotal, numQueries, numFactors');
-
-
-
-//new simpler syntax
-
-var react = require('react');
-
-var loadAndSave = react('allStart, titlesFile, numQueries, numFactors, cb',
-                        foo, 'bar -> err, baz',
-                        cat, 'baz -> err, zoo',
-                        '-> err, allElapse, qTotal');
-
-var loadAndSave = react('allStart, titlesFile, numQueries, numFactors, cb', [
-                        foo, 'bar -> err, baz',
-                        cat, 'baz -> returns zoo'
-                        ], 'err, allElapse, qTotal');
-
-var loadAndSave = react('allStart, titlesFile, numQueries, numFactors, cb', [
-                        foo, 'bar => err, baz',
-                        cat, 'baz -> returns zoo'
-                        ], 'err, allElapse, qTotal');
-
-var loadAndSave = react('allStart, titlesFile, numQueries, numFactors, cb', [
-                        foo, 'bar -> err, baz',
-                        'zoo <- ', cat, 'baz',
-                        ], 'err, allElapse, qTotal');
-
-
-
-var loadAndSave = react('allStart, titlesFile, numQueries, numFactors, cb -> err, allElapse, qTotal',
-                        foo, 'bar -> err, baz',
-                        cat, 'baz -> err, zoo');
-loadAndSave(1, 2, 3, cb);
-
-OR using AST
-
-var loadAndSave = react();
-loadAndSave.ast.inputs(['one', 'two'])
-   .tasks({ })
-   .outTask({ });
-
-loadAndSave(1,2,cb);
-
-
-
-