perf: deep require pull stream modules

In able to create a minimal bundle, require pull stream modules
directly: https://www.npmjs.com/package/pull-stream#minimal-bundle

Author: achingbrain

src/dir-flat.js

@@ -1,6 +1,9 @@
 'use strict'
 
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const values = require('pull-stream/sources/values')
+const filter = require('pull-stream/throughs/filter')
+const map = require('pull-stream/throughs/map')
 const cat = require('pull-cat')
 
 // Logic to export a unixfs directory.
@@ -20,14 +23,14 @@ function dirExporter (cid, node, name, path, pathRest, resolve, size, dag, paren
 
   // we are at the max depth so no need to descend into children
   if (options.maxDepth && options.maxDepth <= depth) {
-    return pull.values([dir])
+    return values([dir])
   }
 
   const streams = [
     pull(
-      pull.values(node.links),
-      pull.filter((item) => accepts === undefined || item.name === accepts),
-      pull.map((link) => ({
+      values(node.links),
+      filter((item) => accepts === undefined || item.name === accepts),
+      map((link) => ({
         depth: depth + 1,
         size: link.size,
         name: link.name,
@@ -43,7 +46,7 @@ function dirExporter (cid, node, name, path, pathRest, resolve, size, dag, paren
 
   // place dir before if not specifying subtree
   if (!pathRest.length || options.fullPath) {
-    streams.unshift(pull.values([dir]))
+    streams.unshift(values([dir]))
   }
 
   return cat(streams)

src/dir-hamt-sharded.js

@@ -1,6 +1,9 @@
 'use strict'
 
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const values = require('pull-stream/sources/values')
+const filter = require('pull-stream/throughs/filter')
+const map = require('pull-stream/throughs/map')
 const cat = require('pull-cat')
 
 // Logic to export a unixfs directory.
@@ -21,13 +24,13 @@ function shardedDirExporter (cid, node, name, path, pathRest, resolve, size, dag
 
   // we are at the max depth so no need to descend into children
   if (options.maxDepth && options.maxDepth <= depth) {
-    return pull.values([dir])
+    return values([dir])
   }
 
   const streams = [
     pull(
-      pull.values(node.links),
-      pull.map((link) => {
+      values(node.links),
+      map((link) => {
         // remove the link prefix (2 chars for the bucket index)
         const p = link.name.substring(2)
         const pp = p ? path + '/' + p : path
@@ -50,14 +53,14 @@ function shardedDirExporter (cid, node, name, path, pathRest, resolve, size, dag
           return ''
         }
       }),
-      pull.filter(Boolean),
+      filter(Boolean),
       resolve
     )
   ]
 
   // place dir before if not specifying subtree
   if (!pathRest.length || options.fullPath) {
-    streams.unshift(pull.values([dir]))
+    streams.unshift(values([dir]))
   }
 
   return cat(streams)

src/file.js

@@ -2,7 +2,14 @@
 
 const traverse = require('pull-traverse')
 const UnixFS = require('ipfs-unixfs')
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const values = require('pull-stream/sources/values')
+const error = require('pull-stream/sources/error')
+const once = require('pull-stream/sources/once')
+const empty = require('pull-stream/sources/empty')
+const filter = require('pull-stream/throughs/filter')
+const flatten = require('pull-stream/throughs/flatten')
+const map = require('pull-stream/throughs/map')
 const paramap = require('pull-paramap')
 const extractDataFromBlock = require('./extract-data-from-block')
 
@@ -11,15 +18,15 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
   const accepts = pathRest[0]
 
   if (accepts !== undefined && accepts !== path) {
-    return pull.empty()
+    return empty()
   }
 
   let file
 
   try {
     file = UnixFS.unmarshal(node.data)
-  } catch (error) {
-    return pull.error(error)
+  } catch (err) {
+    return error(err)
   }
 
   const fileSize = size || file.fileSize()
@@ -28,21 +35,21 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
   let length = options.length
 
   if (offset < 0) {
-    return pull.error(new Error('Offset must be greater than or equal to 0'))
+    return error(new Error('Offset must be greater than or equal to 0'))
   }
 
   if (offset > fileSize) {
-    return pull.error(new Error('Offset must be less than the file size'))
+    return error(new Error('Offset must be less than the file size'))
   }
 
   if (length < 0) {
-    return pull.error(new Error('Length must be greater than or equal to 0'))
+    return error(new Error('Length must be greater than or equal to 0'))
   }
 
   if (length === 0) {
-    return pull.once({
+    return once({
       depth: depth,
-      content: pull.once(Buffer.alloc(0)),
+      content: once(Buffer.alloc(0)),
       name: name,
       path: path,
       multihash: cid.buffer,
@@ -61,7 +68,7 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
 
   const content = streamBytes(dag, node, fileSize, offset, length)
 
-  return pull.values([{
+  return values([{
     depth: depth,
     content: content,
     name: name,
@@ -74,7 +81,7 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
 
 function streamBytes (dag, node, fileSize, offset, length) {
   if (offset === fileSize || length === 0) {
-    return pull.once(Buffer.alloc(0))
+    return once(Buffer.alloc(0))
   }
 
   const end = offset + length
@@ -85,8 +92,8 @@ function streamBytes (dag, node, fileSize, offset, length) {
       start: 0,
       end: fileSize
     }, getChildren(dag, offset, end)),
-    pull.map(extractData(offset, end)),
-    pull.filter(Boolean)
+    map(extractData(offset, end)),
+    filter(Boolean)
   )
 }
 
@@ -98,15 +105,15 @@ function getChildren (dag, offset, end) {
   return function visitor ({ node }) {
     if (Buffer.isBuffer(node)) {
       // this is a leaf node, can't traverse any further
-      return pull.empty()
+      return empty()
     }
 
     let file
 
     try {
       file = UnixFS.unmarshal(node.data)
-    } catch (error) {
-      return pull.error(error)
+    } catch (err) {
+      return error(err)
     }
 
     const nodeHasData = Boolean(file.data && file.data.length)
@@ -142,11 +149,11 @@ function getChildren (dag, offset, end) {
     }
 
     return pull(
-      pull.once(filteredLinks),
+      once(filteredLinks),
       paramap((children, cb) => {
-        dag.getMany(children.map(child => child.link.cid), (error, results) => {
-          if (error) {
-            return cb(error)
+        dag.getMany(children.map(child => child.link.cid), (err, results) => {
+          if (err) {
+            return cb(err)
           }
 
           cb(null, results.map((result, index) => {
@@ -161,7 +168,7 @@ function getChildren (dag, offset, end) {
           }))
         })
       }),
-      pull.flatten()
+      flatten()
     )
   }
 }
@@ -187,8 +194,8 @@ function extractData (requestedStart, requestedEnd) {
         }
 
         block = file.data
-      } catch (error) {
-        throw new Error(`Failed to unmarshal node - ${error.message}`)
+      } catch (err) {
+        throw new Error(`Failed to unmarshal node - ${err.message}`)
       }
     }
 

src/index.js

@@ -1,6 +1,10 @@
 'use strict'
 
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const values = require('pull-stream/sources/values')
+const error = require('pull-stream/sources/error')
+const filter = require('pull-stream/throughs/filter')
+const map = require('pull-stream/throughs/map')
 const CID = require('cids')
 
 const createResolver = require('./resolve').createResolver
@@ -49,7 +53,7 @@ module.exports = (path, dag, options) => {
   try {
     dPath = pathBaseAndRest(path)
   } catch (err) {
-    return pull.error(err)
+    return error(err)
   }
 
   const pathLengthToCut = join(
@@ -58,16 +62,16 @@ module.exports = (path, dag, options) => {
   const cid = new CID(dPath.base)
 
   return pull(
-    pull.values([{
+    values([{
       multihash: cid.buffer,
       name: dPath.base,
       path: dPath.base,
       pathRest: dPath.rest,
       depth: 0
     }]),
     createResolver(dag, options),
-    pull.filter(Boolean),
-    pull.map((node) => {
+    filter(Boolean),
+    map((node) => {
       return {
         depth: node.depth,
         name: node.name,

src/object.js

@@ -1,7 +1,9 @@
 'use strict'
 
 const CID = require('cids')
-const pull = require('pull-stream')
+const pull = require('pull-stream/pull')
+const values = require('pull-stream/sources/values')
+const error = require('pull-stream/sources/error')
 
 module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, depth) => {
   let newNode
@@ -10,13 +12,13 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
     newNode = node[pathElem]
     const newName = path + '/' + pathElem
     if (!newNode) {
-      return pull.error(new Error(`not found`))
+      return error(new Error(`not found`))
     }
 
     const isCID = CID.isCID(newNode)
 
     return pull(
-      pull.values([{
+      values([{
         depth: depth,
         name: pathElem,
         path: newName,
@@ -27,6 +29,6 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
       }]),
       resolve)
   } else {
-    return pull.error(new Error('invalid node type'))
+    return error(new Error('invalid node type'))
   }
 }

src/raw.js

@@ -1,14 +1,16 @@
 'use strict'
 
-const pull = require('pull-stream')
+const error = require('pull-stream/sources/error')
+const once = require('pull-stream/sources/once')
+const empty = require('pull-stream/sources/empty')
 const extractDataFromBlock = require('./extract-data-from-block')
 
 // Logic to export a single raw block
 module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, depth, options) => {
   const accepts = pathRest[0]
 
   if (accepts !== undefined && accepts !== path) {
-    return pull.empty()
+    return empty()
   }
 
   size = size || node.length
@@ -17,21 +19,21 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
   let length = options.length
 
   if (offset < 0) {
-    return pull.error(new Error('Offset must be greater than or equal to 0'))
+    return error(new Error('Offset must be greater than or equal to 0'))
   }
 
   if (offset > size) {
-    return pull.error(new Error('Offset must be less than the file size'))
+    return error(new Error('Offset must be less than the file size'))
   }
 
   if (length < 0) {
-    return pull.error(new Error('Length must be greater than or equal to 0'))
+    return error(new Error('Length must be greater than or equal to 0'))
   }
 
   if (length === 0) {
-    return pull.once({
+    return once({
       depth,
-      content: pull.once(Buffer.alloc(0)),
+      content: once(Buffer.alloc(0)),
       hash: cid,
       name,
       path,
@@ -48,9 +50,9 @@ module.exports = (cid, node, name, path, pathRest, resolve, size, dag, parent, d
     length = size - offset
   }
 
-  return pull.once({
+  return once({
     depth,
-    content: pull.once(extractDataFromBlock(node, 0, offset, offset + length)),
+    content: once(extractDataFromBlock(node, 0, offset, offset + length)),
     hash: cid,
     name,
     path,