Merge pull request #3 from manidlou/fix-filter-with-opts

Apply opts.nodir and opts.nofile when filter is used
manidlou · Apr 26, 2017 · 68d40ec · 68d40ec
2 parents 2059501 + 4d6a552
commit 68d40ec
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 5 deletions.
diff --git a/klaw-sync.js b/klaw-sync.js
@@ -13,7 +13,7 @@ function klawSync (dir, opts, ls) {
     const item = {path: pathItem, stats: stat}
     if (stat.isDirectory()) {
       if (opts.filter) {
-        if (opts.filter(item)) {
+        if (opts.filter(item) && !opts.nodir) {
           ls.push(item)
           ls = klawSync(pathItem, opts, ls)
         } else {
@@ -25,7 +25,7 @@ function klawSync (dir, opts, ls) {
       }
     } else {
       if (opts.filter) {
-        if (opts.filter(item)) ls.push(item)
+        if (opts.filter(item) && !opts.nofile) ls.push(item)
       } else {
         if (!opts.nofile) ls.push(item)
       }

diff --git a/test/test.js b/test/test.js
@@ -98,7 +98,7 @@ describe('klaw-sync', () => {
         {path: f1, stats: fs.statSync(f1)},
         {path: f2, stats: fs.statSync(f2)}
       ]
-      const filterFunc = (i) => path.extname(i.path) === '.js'
+      const filterFunc = i => path.extname(i.path) === '.js'
       const items = klawSync(TEST_DIR, {filter: filterFunc})
       assert.equal(items.length, paths.length)
       items.forEach((p, i) => {
@@ -117,7 +117,7 @@ describe('klaw-sync', () => {
         {path: f1, stats: fs.statSync(f1)},
         {path: f2, stats: fs.statSync(f2)}
       ]
-      const filterFunc = (i) => i.stats.isFile() && i.stats.size > 0
+      const filterFunc = i => i.stats.isFile() && i.stats.size > 0
       const items = klawSync(TEST_DIR, {filter: filterFunc})
       assert.equal(items.length, paths.length)
       items.forEach((p, i) => {
@@ -136,7 +136,7 @@ describe('klaw-sync', () => {
         {path: f1, stats: fs.statSync(f1)},
         {path: f2, stats: fs.statSync(f2)}
       ]
-      const filterFunc = (i) => path.extname(i.path) === '.js' && i.stats.size > 0
+      const filterFunc = i => path.extname(i.path) === '.js' && i.stats.size > 0
       const items = klawSync(TEST_DIR, {filter: filterFunc})
       assert.equal(items.length, paths.length)
       items.forEach((p, i) => {
@@ -192,5 +192,45 @@ describe('klaw-sync', () => {
         assert.deepEqual(p.stats, paths[i].stats)
       })
     })
+
+    it('should filter and apply opts.nodir', () => {
+      const f1 = path.join(TEST_DIR, 'dir1', 'foo.js')
+      const f2 = path.join(TEST_DIR, 'dir2', 'dir2_1', 'bar.js')
+      fs.outputFileSync(f1, 'test file 1 contents')
+      fs.outputFileSync(f2, 'test file 2 contents')
+      const paths = [
+        {path: f1, stats: fs.statSync(f1)},
+        {path: f2, stats: fs.statSync(f2)}
+      ]
+      const filterFunc = i => i.stats.size > 0
+      const items = klawSync(TEST_DIR, {filter: filterFunc, nodir: true})
+      assert.equal(items.length, paths.length)
+      items.forEach((p, i) => {
+        assert.deepEqual(p, paths[i])
+        assert.strictEqual(p.path, paths[i].path)
+        assert.deepEqual(p.stats, paths[i].stats)
+      })
+    })
+
+    it('should filter and apply opts.nofile', () => {
+      const f = path.join(TEST_DIR, 'foo.js')
+      const d1 = path.join(TEST_DIR, 'foo')
+      const d2 = path.join(TEST_DIR, 'foobar')
+      fs.ensureFileSync(f)
+      fs.ensureDirSync(d1)
+      fs.ensureDirSync(d2)
+      const paths = [
+        {path: d1, stats: fs.statSync(d1)},
+        {path: d2, stats: fs.statSync(d2)}
+      ]
+      const filterFunc = i => i.path.indexOf('foo') > 0
+      const items = klawSync(TEST_DIR, {filter: filterFunc, nofile: true})
+      assert.equal(items.length, paths.length)
+      items.forEach((p, i) => {
+        assert.deepEqual(p, paths[i])
+        assert.strictEqual(p.path, paths[i].path)
+        assert.deepEqual(p.stats, paths[i].stats)
+      })
+    })
   })
 })