react 0.2.6 → 0.3.0

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

@@ -282,8 +282,10 @@ 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: [] }
+      { 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: [] }
   };

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

package/oldExamples/example11.js

@@ -1,62 +0,0 @@
-'use strict';
-
-var react = require('react');
-
-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 useHtml(err, html, user, bytesWritten) {
-  if (err) {
-    console.log('***Error: %s', err);
-    return;
-  }
-  console.log('final result: %s, user: %s, written:%s', html, user, bytesWritten);     
-}
-
-
-
-var fn = react(function (r, filename, uid, outDirname, cb) {
-  var err, user, html, bytesWritten;
-  r.sync(loadUser).in(uid).out(err, user)
-    .cb(err, html, user, bytesWritten);
-});
-
-
-/*
-var r = react();
-    r.ast.inputNames = ['filename', 'uid', 'outDirname', 'cb'];
-    r.ast.taskDefs = [
-      { f:loadUser,          a:['uid'],               cb:['user'] },
-      { f:loadFile,          a:['filename'],          cb:['filedata'] },
-      { f:markdown,          a:['filedata'],          ret:['html'] },
-      { f:prepareDirectory,  a:['outDirname'],        cb:['dircreated'] },
-      { f:writeOutput,       a:['html', 'user'],      cb:['bytesWritten'],   after:['prepareDirectory'] },
-      { f:loadEmailTemplate, a:[],                    cb:['emailmd'] },
-      { f:markdown,          a:['emailmd'],           ret:['emailHtml'] },
-      { f:customizeEmail,    a:['user', 'emailHtml'], ret:['custEmailHtml'] },
-      { f:deliverEmail,      a:['custEmailHtml'],     cb:['deliveredEmail'], after:['writeOutput'] }
-    ];
-    r.ast.finalOutputNames = ['html', 'user', 'bytesWritten'];
-*/
-
-var fn = react(function (r, filename, uid, outDirname, cb) {
-  var filedata, outDirName, dircreated, emailmd, emailHtml, custEmailHtml, deliveredEmail;
-  var err, user, html, bytesWritten;
-  
-  r.async(loadUser).in(uid).out(err, user)
-    .async(loadFile).in(filename).out(filedata)
-    .sync(markdown).in(filedata).out(html)
-    .async(prepareDirectory).in(outDirName).out(dircreated)
-    .async(writeOutput).in(html, user).out(bytesWritten).after(prepareDirectory)
-    .async(loadEmailTemplate).out(emailmd)
-    .sync(markdown).in(emailmd).out(emailHtml)
-    .sync(customizeEmail).in(user, emailHtml).out(custEmailHtml)
-    .async(deliveredEmail).in(custEmailHtml).out(deliveredEmail).after(writeOutput)
-    .cb(err, html, user, bytesWritten);
-});

package/oldExamples/example12.js

@@ -1,63 +0,0 @@
-'use strict';
-
-var react = require('react');
-
-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 useHtml(err, html, user, bytesWritten) {
-  if (err) {
-    console.log('***Error: %s', err);
-    return;
-  }
-  console.log('final result: %s, user: %s, written:%s', html, user, bytesWritten);     
-}
-
-
-
-var fn = react(function (r, filename, uid, outDirname, cb) {
-  var err, user, html, bytesWritten;
-  r.sync(loadUser).in(uid).out(err, user)
-    .cb(err, html, user, bytesWritten);
-});
-
-
-/*
-var r = react();
-    r.ast.inputNames = ['filename', 'uid', 'outDirname', 'cb'];
-    r.ast.taskDefs = [
-      { f:loadUser,          a:['uid'],               cb:['user'] },
-      { f:loadFile,          a:['filename'],          cb:['filedata'] },
-      { f:markdown,          a:['filedata'],          ret:['html'] },
-      { f:prepareDirectory,  a:['outDirname'],        cb:['dircreated'] },
-      { f:writeOutput,       a:['html', 'user'],      cb:['bytesWritten'],   after:['prepareDirectory'] },
-      { f:loadEmailTemplate, a:[],                    cb:['emailmd'] },
-      { f:markdown,          a:['emailmd'],           ret:['emailHtml'] },
-      { f:customizeEmail,    a:['user', 'emailHtml'], ret:['custEmailHtml'] },
-      { f:deliverEmail,      a:['custEmailHtml'],     cb:['deliveredEmail'], after:['writeOutput'] }
-    ];
-    r.ast.finalOutputNames = ['html', 'user', 'bytesWritten'];
-*/
-
-var fn = react(function (r, filename, uid, outDirname, cb,
-                         filedata, outDirName, dircreated, emailmd, emailHtml,
-                         custEmailHtml, deliveredEmail,
-                         err, user, html, bytesWritten) {
-
-  r.async(loadUser, [uid], [err, user])
-    .async(loadFile, [filename], [filedata])
-    .sync(markdown, [filedata], filedata)
-    .async(prepareDirectory, [outDirName], [dircreated])
-    .async(writeOutput, [html, user], [err, bytesWritten], { after: prepareDirectory })
-    .async(loadEmailTemplate, [], [emailmd])
-    .sync(markdown, [emailmd], emailHtml)
-    .sync(customizeEmail, [user, emailHtml], custEmailHtml)
-    .sync(deliverEmail, [custEmailHtml], [deliveredEmail], { after: writeOutput })
-    .cb(err, html, user, bytesWritten);
-});

package/oldExamples/example13.js

@@ -1,63 +0,0 @@
-'use strict';
-
-var react = require('react');
-
-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 useHtml(err, html, user, bytesWritten) {
-  if (err) {
-    console.log('***Error: %s', err);
-    return;
-  }
-  console.log('final result: %s, user: %s, written:%s', html, user, bytesWritten);     
-}
-
-
-
-var fn = react(function (r, filename, uid, outDirname, cb) {
-  var err, user, html, bytesWritten;
-  r.sync(loadUser).in(uid).out(err, user)
-    .cb(err, html, user, bytesWritten);
-});
-
-
-/*
-var r = react();
-    r.ast.inputNames = ['filename', 'uid', 'outDirname', 'cb'];
-    r.ast.taskDefs = [
-      { f:loadUser,          a:['uid'],               cb:['user'] },
-      { f:loadFile,          a:['filename'],          cb:['filedata'] },
-      { f:markdown,          a:['filedata'],          ret:['html'] },
-      { f:prepareDirectory,  a:['outDirname'],        cb:['dircreated'] },
-      { f:writeOutput,       a:['html', 'user'],      cb:['bytesWritten'],   after:['prepareDirectory'] },
-      { f:loadEmailTemplate, a:[],                    cb:['emailmd'] },
-      { f:markdown,          a:['emailmd'],           ret:['emailHtml'] },
-      { f:customizeEmail,    a:['user', 'emailHtml'], ret:['custEmailHtml'] },
-      { f:deliverEmail,      a:['custEmailHtml'],     cb:['deliveredEmail'], after:['writeOutput'] }
-    ];
-    r.ast.finalOutputNames = ['html', 'user', 'bytesWritten'];
-*/
-
-var fn = react(function (r, filename, uid, outDirname, cb,
-                         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/example14.js

@@ -1,63 +0,0 @@
-'use strict';
-
-var react = require('react');
-
-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 useHtml(err, html, user, bytesWritten) {
-  if (err) {
-    console.log('***Error: %s', err);
-    return;
-  }
-  console.log('final result: %s, user: %s, written:%s', html, user, bytesWritten);     
-}
-
-
-
-var fn = react(function (r, filename, uid, outDirname, cb) {
-  var err, user, html, bytesWritten;
-  r.sync(loadUser).in(uid).out(err, user)
-    .cb(err, html, user, bytesWritten);
-});
-
-
-/*
-var r = react();
-    r.ast.inputNames = ['filename', 'uid', 'outDirname', 'cb'];
-    r.ast.taskDefs = [
-      { f:loadUser,          a:['uid'],               cb:['user'] },
-      { f:loadFile,          a:['filename'],          cb:['filedata'] },
-      { f:markdown,          a:['filedata'],          ret:['html'] },
-      { f:prepareDirectory,  a:['outDirname'],        cb:['dircreated'] },
-      { f:writeOutput,       a:['html', 'user'],      cb:['bytesWritten'],   after:['prepareDirectory'] },
-      { f:loadEmailTemplate, a:[],                    cb:['emailmd'] },
-      { f:markdown,          a:['emailmd'],           ret:['emailHtml'] },
-      { f:customizeEmail,    a:['user', 'emailHtml'], ret:['custEmailHtml'] },
-      { f:deliverEmail,      a:['custEmailHtml'],     cb:['deliveredEmail'], after:['writeOutput'] }
-    ];
-    r.ast.finalOutputNames = ['html', 'user', 'bytesWritten'];
-*/
-
-var fn = react(function (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);
-});
-  
-