fix: Fix filter option issue.

Author: jaywcjlove

src/index.test.ts

@@ -3,15 +3,15 @@
 import path from 'path';
 import recursiveReaddirFiles from './';
 
-it('Recursive Readdir Files', async () => {
+it('ignored test case', async () => {
   const files = await recursiveReaddirFiles(process.cwd(), {
     ignored: /\/(node_modules|coverage|\.git)/
   });
   expect(files.length).toBe(10);
   expect(Object.keys(files[0])).toEqual(['name', 'path', 'size', 'ext']);
 });
 
-it('Recursive Readdir Files', async () => {
+it('ignored/exclude/include test case', async () => {
   const files = await recursiveReaddirFiles(process.cwd(), {
     ignored: /\/(node_modules|coverage|\.git)/,
     exclude: /(\.json)$/,
@@ -42,6 +42,7 @@ it('Recursive Readdir Files. try catch', async () => {
 
 it('filter options test case', async () => {
   const files = await recursiveReaddirFiles(process.cwd(), {
+    ignored: /\/(node_modules|\.git|(coverage))/,
     filter: (item) => /(.md)/.test(item.path)
   });
   expect(files.length).toBe(1);

src/index.ts

@@ -50,19 +50,16 @@ async function getFiles(rootPath: string, options: RecursiveReaddirFilesOptions
     name: file,
     path: path.join(rootPath, file),
   })).filter(item => {
-    if (filter && typeof filter === 'function') {
-      return filter(item);
-    }
     if (include && include.test(item.path)) {
       return true;
     }
     if (exclude && exclude.test(item.path)) {
       return false
     }
-    if (!ignored || !ignored.test(item.path)) { 
-      return true;
+    if (ignored) {
+      return !ignored.test(item.path)
     }
-    return false;
+    return true;
   });
 
   await Promise.all(
@@ -79,7 +76,12 @@ async function getFiles(rootPath: string, options: RecursiveReaddirFilesOptions
       }
     }),
   );
-  return files;
+  return files.filter((item) => {
+    if (filter && typeof filter === 'function') {
+      return filter(item);
+    }
+    return true
+  });
 }