Fixing logic issues

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 benchmark/klaw-sync-benchmark-fixtures/
 npm-debug.log
+.idea

klaw-sync.js

@@ -15,23 +15,13 @@ function klawSync (dir, opts, ls) {
     const pi = paths[i]
     const st = opts.fs.statSync(pi)
     const item = {path: pi, stats: st}
-    if (!st.isDirectory() || (opts.rootDepth &&
-      pi.split(path.sep).length - opts.rootDepth >= opts.depthLimit)) {
-      if (opts.filter) {
-        if (opts.filter(item) && !opts.nofile) ls.push(item)
-      } else if (!opts.nofile) {
-        ls.push(item)
-      }
-    } else {
-      if (opts.filter) {
-        if (opts.filter(item) && !opts.nodir) {
-          ls.push(item)
-          ls = klawSync(pi, opts, ls)
-        }
-      } else {
-        if (!opts.nodir) ls.push(item)
-        ls = klawSync(pi, opts, ls)
-      }
+    const isUnderDepthLimit = (!opts.rootDepth || pi.split(path.sep).length - opts.rootDepth < opts.depthLimit)
+
+    if (st.isDirectory()) {
+      if (!opts.nodir) { if ((opts.filter && opts.filter(item)) || !opts.filter) ls.push(item) }
+      if (isUnderDepthLimit && ((opts.filter && opts.filter(item)) || !opts.filter)) ls = klawSync(pi, opts, ls)
+    } else if (!st.isDirectory()) {
+      if (!opts.nofile) { if ((opts.filter && opts.filter(item)) || !opts.filter) ls.push(item) }
     }
   }
   return ls

test/klaw-sync.test.js

@@ -229,6 +229,93 @@ describe('klaw-sync', () => {
       testDepthLimit(3, expected)
     })
 
+    it('should honor depthLimit option -1 with nodir = true', () => {
+      const expected = ['a/b/c/d.txt', 'a/e.jpg', 'h/i/j/k.txt', 'h/i/l.txt', 'h/i/m.jpg', 't.txt']
+      testDepthLimitNoDir(-1, expected)
+    })
+
+    it('should honor depthLimit option 0 with nodir = true', () => {
+      const expected = ['t.txt']
+      testDepthLimitNoDir(0, expected)
+    })
+
+    it('should honor depthLimit option 1 with nodir = true', () => {
+      const expected = ['a/e.jpg', 't.txt']
+      testDepthLimitNoDir(1, expected)
+    })
+
+    it('should honor depthLimit option -1 with nodir = true and with a filter to search for a specific file', () => {
+      let expected = ['h/i/j/k.txt']
+      const fixtures = [
+        'a/b/c/d.txt',
+        'a/e.jpg',
+        'h/i/j/k.txt',
+        'h/i/l.txt',
+        'h/i/m.jpg',
+        't.txt'
+      ]
+
+      const filterFunction = function (item) {
+        return item.stats.isDirectory() || path.basename(item.path) === 'k.txt'
+      }
+
+      fixtures.forEach(f => {
+        f = path.join(TEST_DIR, f)
+        fs.outputFileSync(f, path.basename(f, path.extname(f)))
+      })
+
+      const items = klawSync(TEST_DIR, {depthLimit: -1, nodir: true, filter: filterFunction}).map(i => i.path)
+      items.sort()
+      expected = expected.map(item => path.join(path.join(TEST_DIR, item)))
+      assert.deepStrictEqual(items, expected)
+    })
+
+    it('should return all files except under filtered out directory', () => {
+      let expected = ['a/b/c/d.txt', 'a/e.jpg', 't.txt']
+      const fixtures = [
+        'a/b/c/d.txt',
+        'a/e.jpg',
+        'h/i/j/k.txt',
+        'h/i/l.txt',
+        'h/i/m.jpg',
+        't.txt'
+      ]
+
+      const filterFunction = function (item) {
+        return !item.stats.isDirectory() || (item.stats.isDirectory() && path.basename(item.path) !== 'i')
+      }
+
+      fixtures.forEach(f => {
+        f = path.join(TEST_DIR, f)
+        fs.outputFileSync(f, path.basename(f, path.extname(f)))
+      })
+
+      const items = klawSync(TEST_DIR, {depthLimit: -1, nodir: true, filter: filterFunction}).map(i => i.path)
+      items.sort()
+      expected = expected.map(item => path.join(path.join(TEST_DIR, item)))
+      assert.deepStrictEqual(items, expected)
+    })
+
+    function testDepthLimitNoDir (depthLimit, expected) {
+      const fixtures = [
+        'a/b/c/d.txt',
+        'a/e.jpg',
+        'h/i/j/k.txt',
+        'h/i/l.txt',
+        'h/i/m.jpg',
+        't.txt'
+      ]
+      fixtures.forEach(f => {
+        f = path.join(TEST_DIR, f)
+        fs.outputFileSync(f, path.basename(f, path.extname(f)))
+      })
+
+      const items = klawSync(TEST_DIR, {depthLimit: depthLimit, nodir: true}).map(i => i.path)
+      items.sort()
+      expected = expected.map(item => path.join(path.join(TEST_DIR, item)))
+      assert.deepStrictEqual(items, expected)
+    }
+
     function testDepthLimit (depthLimit, expected) {
       const fixtures = [
         'a/b/c/d.txt',