Simplify send.withTransform API.

Author: hackergrrl

src/api/add.js

@@ -11,17 +11,17 @@ module.exports = (send) => {
       opts = {}
     }
 
-    var sendBackDagNode = sendWithTransform(send, transform)
+    send = send.withTransform(transform)
 
     if (typeof files === 'string' && files.startsWith('http')) {
       return Wreck.request('GET', files, null, (err, res) => {
         if (err) return cb(err)
 
-        sendBackDagNode('add', null, opts, res, cb)
+        send('add', null, opts, res, cb)
       })
     }
 
-    return sendBackDagNode('add', null, opts, files, cb)
+    return send('add', null, opts, files, cb)
 
     // transform returned objects into DAGNodes
     function transform (err, res, done) {
@@ -41,37 +41,3 @@ module.exports = (send) => {
     }
   }
 }
-
-// Wraps the 'send' function such that an asynchronous transform may be applied
-// to its result before passing it on to either its callback or promise.
-function sendWithTransform (send, transform) {
-  return function (path, args, qs, files, buffer, cb) {
-    if (typeof buffer === 'function') {
-      cb = buffer
-      buffer = false
-    }
-
-    var p = send(path, args, qs, files, buffer, wrap(cb))
-
-    if (p instanceof Promise) {
-      return p.then((res) => {
-        return new Promise(function (resolve, reject) {
-          transform(null, res, function (err, res) {
-            if (err) reject(err)
-            else resolve(res)
-          })
-        })
-      })
-    } else {
-      return p
-    }
-
-    function wrap (done) {
-      if (done) {
-        return function (err, res) {
-          transform(err, res, done)
-        }
-      }
-    }
-  }
-}

src/request-api.js

@@ -110,7 +110,7 @@ function requestAPI (config, path, args, qs, files, buffer, cb) {
 // -- Interface
 
 exports = module.exports = function getRequestAPI (config) {
-  return function (path, args, qs, files, buffer, cb) {
+  var send = function (path, args, qs, files, buffer, cb) {
     if (typeof buffer === 'function') {
       cb = buffer
       buffer = false
@@ -127,4 +127,41 @@ exports = module.exports = function getRequestAPI (config) {
 
     return requestAPI(config, path, args, qs, files, buffer, cb)
   }
+
+  // Wraps the 'send' function such that an asynchronous transform may be
+  // applied to its result before passing it on to either its callback or
+  // promise.
+  send.withTransform = function (transform) {
+    return function (path, args, qs, files, buffer, cb) {
+      if (typeof buffer === 'function') {
+        cb = buffer
+        buffer = false
+      }
+
+      var p = send(path, args, qs, files, buffer, wrap(cb))
+
+      if (p instanceof Promise) {
+        return p.then((res) => {
+          return new Promise(function (resolve, reject) {
+            transform(null, res, function (err, res) {
+              if (err) reject(err)
+              else resolve(res)
+            })
+          })
+        })
+      } else {
+        return p
+      }
+
+      function wrap (done) {
+        if (done) {
+          return function (err, res) {
+            transform(err, res, done)
+          }
+        }
+      }
+    }
+  }
+
+  return send
 }