Allow r.do with one argument - Fix neumino#344

AIDAX · Aug 3, 2017 · af1f9c6 · af1f9c6
1 parent 1d119dc
commit af1f9c6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -405,7 +405,7 @@ r.prototype.http = function() {
 }
 r.prototype.do = function() {
   var _len = arguments.length;var _args = new Array(_len); for(var _i = 0; _i < _len; _i++) {_args[_i] = arguments[_i];}
-  Term.prototype._arityRange(_args, 2, Infinity, 'r.do', this);
+  Term.prototype._arityRange(_args, 1, Infinity, 'r.do', this);
 
   var term = new Term(this).expr(_args[0]);
   return term.do.apply(term, _args.slice(1));

diff --git a/lib/term.js b/lib/term.js
@@ -2255,11 +2255,13 @@ Term.prototype.args = function() {
 }
 Term.prototype.do = function() {
   var _len = arguments.length;var _args = new Array(_len); for(var _i = 0; _i < _len; _i++) {_args[_i] = arguments[_i];}
-  this._arityRange(_args, 1, Infinity, 'do', this);
 
   var term = new Term(this._r);
   term._query.push(termTypes.FUNCALL);
-  var args = [new Term(this._r).expr(_args[_args.length-1])._wrap()._query];
+  var args = [];
+  if (_args.length > 0) {
+    args.push(new Term(this._r).expr(_args[_args.length-1])._wrap()._query);
+  }
   args.push(this);
   for(var i=0; i<_args.length-1; i++) {
     args.push(new Term(this._r).expr(_args[i]))

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   "bugs": {
     "url": "https://github.com/neumino/rethinkdbdash/issues"
   },
-  "dependencies":{
+  "dependencies": {
     "bluebird": ">= 3.0.1"
   },
   "devDependencies": {

diff --git a/test/control-structures.js b/test/control-structures.js
@@ -27,6 +27,18 @@ It('`r.do` should work', function* (done) {
     result = yield r.do(1, 2, function(a, b) { return b }).run();
     assert.equal(result, 2);
 
+    result = yield r.do(3).run();
+    assert.equal(result, 3);
+
+    result = yield r.expr(4).do().run();
+    assert.equal(result, 4);
+
+    result = yield r.do(1, 2).run()
+    assert.deepEqual(result, 2);
+
+    result = yield r.do(r.args([ r.expr(3), r.expr(4) ])).run()
+    assert.deepEqual(result, 3);
+
     done();
   }
   catch(e) {
@@ -36,21 +48,6 @@ It('`r.do` should work', function* (done) {
 })
 
 
-It('`do` should throw if no argument has been given', function* (done) {
-  try{
-    var result = yield r.expr(1).do().run();
-  }
-  catch(e) {
-    if (e.message.match(/^`do` takes at least 1 argument, 0 provided after:/)) {
-      done()
-    }
-    else {
-      done(e);
-    }
-  }
-})
-
-
 It('`branch` should work', function* (done) {
   try {
     var result = yield r.branch(true, 1, 2).run();