rethinkdbdash - npm Package Compare versions

Comparing version 1.12.9 to 1.12.10

lib/error.js

@@ -543,13 +543,33 @@ var helper = require(__dirname+"/helper.js");
 
-        if ((currentFrame != null) && (currentFrame.pos === 1)) {
-            backtrace = generateBacktrace(term.args[1], 0, term, frames, options);
+        if (term.args.length === 2) {
+            if ((currentFrame != null) && (currentFrame.pos === 1)) {
+                backtrace = generateBacktrace(term.args[1], 0, term, frames, options);
+            }
+            else {
+                backtrace = generateBacktrace(term.args[1], 0, term, null, options);
+            }
+            result.str = backtrace.str;
+            result.car = backtrace.car;
+
+            carify(result, ".do(", underline);
         }
         else {
-            backtrace = generateBacktrace(term.args[1], 0, term, null, options);
+            carify(result, "r.do(", underline);
+
+            for(var i=1; i<term.args.length; i++) {
+                if ((currentFrame != null) && (currentFrame.pos === i)) {
+                    backtrace = generateBacktrace(term.args[i], i, term, frames, options);
+                }
+                else {
+                    backtrace = generateBacktrace(term.args[i], i, term, null, options);
+                }
+                result.str += backtrace.str;
+                result.car += backtrace.car;
+
+                if (i !== term.args.length) {
+                    carify(result, ", " , underline);
+                }
+            }
         }
-        result.str = backtrace.str;
-        result.car = backtrace.car;
 
-        carify(result, ".do(", underline);
-
         if ((currentFrame != null) && (currentFrame.pos === 0)) {
@@ -556,0 +576,0 @@ backtrace = generateBacktrace(term.args[0], 0, term, frames, options);

package.json

 {
   "name": "rethinkdbdash",
-  "version": "1.12.9",
+  "version": "1.12.10",
   "description": "A Node.js driver for RethinkDB with promises and a connection pool",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

tool/generateTest.js

@@ -12,3 +12,3 @@ var Promise = require('bluebird');
 var query;
-query = 'r.expr(1).do(function(v) { return r.object("a") })'
+query = 'r.do(1, 2, function(a, b) { return a.add("foo") })'
 
@@ -15,0 +15,0 @@ Promise.coroutine(function* () {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

440208

increased by0.34%

Lines of code

13232

increased by0.33%

No dependency changes