Remove detailed option from readdir, fixes #79

mhkeller · Aug 20, 2019 · c9c1309 · c9c1309
1 parent 32b5b57
commit c9c1309
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 56 deletions.
diff --git a/dist/indian-ocean.browser.es6.js b/dist/indian-ocean.browser.es6.js
diff --git a/dist/indian-ocean.cjs.js b/dist/indian-ocean.cjs.js
diff --git a/dist/indian-ocean.cjs.js.map b/dist/indian-ocean.cjs.js.map
diff --git a/dist/indian-ocean.js b/dist/indian-ocean.js
diff --git a/dist/indian-ocean.min.js b/dist/indian-ocean.min.js
diff --git a/src/readers/readdir.js b/src/readers/readdir.js
@@ -48,12 +48,7 @@ export default function readdir (modeInfo, dirPath, opts_, cb) {
 
   function filterByType (file, cb) {
     // We need the full path so convert it if it isn't already
-    var filePath = file
-    if (opts_.detailed === true) {
-      filePath = joinPath(file.basePath, file.fileName)
-    } else if (!opts_.fullPath) {
-      filePath = joinPath(dirPath, file)
-    }
+    var filePath = (opts_.fullPath) ? file : joinPath(dirPath, file)
 
     if (isAsync === true) {
       fs.stat(filePath, function (err, stats) {
@@ -107,21 +102,12 @@ export default function readdir (modeInfo, dirPath, opts_, cb) {
       return true
     })
 
-    if (opts_.fullPath === true && opts_.detailed === true) {
-      throw new Error('[indian-ocean] Both `fullPath` and `detailed` are `true`. You can only set one or the other.')
-    }
     // Prefix with the full path if that's what we asked for
     if (opts_.fullPath === true) {
       return filtered.map(function (fileName) {
         return joinPath(dirPath, fileName)
       })
     }
-    // Or return detailed format
-    if (opts_.detailed === true) {
-      return filtered.map(function (fileName) {
-        return { basePath: dirPath, fileName: fileName }
-      })
-    }
 
     return filtered
   }

diff --git a/test/test.js b/test/test.js
@@ -1,3 +1,4 @@
+
 /* global describe, it */
 
 var fs = require('fs')
@@ -1716,28 +1717,6 @@ describe('readers', function () {
       })
     })
 
-    describe('detailed readdir results', function () {
-      it('should match expected output', function () {
-        var dir = path.join(__dirname, 'data', 'csv')
-        var files = io.readdirFilterSync(dir, {include: 'csv', detailed: true})
-        assert.deepEqual(files, [
-          {basePath: dir, fileName: 'basic.csv'},
-          {basePath: dir, fileName: 'empty.csv'}
-        ])
-      })
-    })
-
-    describe('detailed readdir results', function () {
-      it('should match expected output', function () {
-        var dir = path.join(__dirname, 'data', 'csv') + '/'
-        var files = io.readdirFilterSync(dir, {include: 'csv', detailed: true})
-        assert.deepEqual(files, [
-          {basePath: dir, fileName: 'basic.csv'},
-          {basePath: dir, fileName: 'empty.csv'}
-        ])
-      })
-    })
-
     describe('use regex', function () {
       it('should match expected output', function () {
         var dir = path.join(__dirname, 'data', 'mixed')