fix: exporter: recurse correctly into subdirs (#136)

* fix: exporter: recurse correctly into subdirs

* fix: exporter: also yielding dir before recursing

package.json

@@ -63,6 +63,7 @@
     "lodash": "^4.17.4",
     "multihashes": "^0.3.2",
     "pull-batch": "^1.0.0",
+    "pull-cat": "^1.1.11",
     "pull-block": "^1.1.0",
     "pull-pair": "^1.1.0",
     "pull-paramap": "^1.2.1",
@@ -84,4 +85,4 @@
     "jbenet <[email protected]>",
     "nginnever <[email protected]>"
   ]
-}
+}

src/exporter/dir.js

@@ -4,12 +4,15 @@ const path = require('path')
 const pull = require('pull-stream')
 const paramap = require('pull-paramap')
 const CID = require('cids')
+const cat = require('pull-cat')
 
 const fileExporter = require('./file')
 const switchType = require('../util').switchType
 
 // Logic to export a unixfs directory.
-module.exports = (node, name, ipldResolver) => {
+module.exports = dirExporter
+
+function dirExporter (node, name, ipldResolver) {
   // The algorithm below is as follows
   //
   // 1. Take all links from a given directory node
@@ -20,6 +23,7 @@ module.exports = (node, name, ipldResolver) => {
   //      - `directory`: return node
   //      - `file`: use the fileExporter to load and return the file
   // 4. Flatten
+
   return pull(
     pull.values(node.links),
     pull.map((link) => ({
@@ -31,9 +35,14 @@ module.exports = (node, name, ipldResolver) => {
         return cb(err)
       }
 
+      const dir = {
+        path: item.path,
+        size: item.size
+      }
+
       cb(null, switchType(
         n,
-        () => pull.values([item]),
+        () => cat([pull.values([dir]), dirExporter(n, item.path, ipldResolver)]),
         () => fileExporter(n, item.path, ipldResolver)
       ))
     })),