refactor: Modify callback handle.

jaywcjlove · Apr 19, 2022 · 515d1d1 · 515d1d1
1 parent f5e9904
commit 515d1d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -147,7 +147,7 @@ export interface IFileDirStat extends Partial<fs.Stats> {
    */
   ext?: string;
 }
-declare type Callback = (filepath: string, stat: IFileDirStat, childs: IFileDirStat[]) => void;
+declare type Callback = (filepath: string, stat: IFileDirStat) => void;
 export default function recursiveReaddirFiles(rootPath: string, options?: RecursiveReaddirFilesOptions, callback?: Callback): Promise<IFileDirStat[]>;
 export { recursiveReaddirFiles };
 /**

diff --git a/src/index.test.ts b/src/index.test.ts
@@ -115,13 +115,10 @@ it('Recursive Readdir Files, callback', async () => {
       exclude: /(\.json)$/,
       include: /(package\.json)$/,
     },
-    (file, stat, childs) => {
+    (file, stat) => {
+      expect(typeof file === 'string').toBeTruthy();
       expect(typeof stat.isFile === 'function').toBeTruthy();
       expect(typeof stat.isDirectory === 'function').toBeTruthy();
-      expect(Array.isArray(childs)).toBeTruthy();
-      if (stat.isDirectory() && file.endsWith('src')) {
-        expect(childs.length).toEqual(2);
-      }
     },
   );
   expect(files.length).toBe(0);

diff --git a/src/index.ts b/src/index.ts
@@ -36,7 +36,7 @@ export interface IFileDirStat extends Partial<fs.Stats> {
   ext?: string;
 }
 
-type Callback = (filepath: string, stat: IFileDirStat, childs: IFileDirStat[]) => void;
+type Callback = (filepath: string, stat: IFileDirStat) => void;
 
 export default function recursiveReaddirFiles(
   rootPath: string,
@@ -77,16 +77,14 @@ async function getFiles(
     fileDir.map(async (item: IFileDirStat) => {
       const stat = (await fs.promises.stat(item.path)) as IFileDirStat;
       stat.ext = '';
-      let childs: IFileDirStat[] = [];
       if (stat.isDirectory()) {
-        const arr = await getFiles(item.path, options, []);
-        childs = childs.concat(arr);
+        getFiles(item.path, options, [], callback);
       } else if (stat.isFile()) {
         stat.ext = getExt(item.path);
         stat.name = item.name;
         stat.path = item.path;
       }
-      callback(item.path, stat, childs);
+      callback(item.path, stat);
     });
   } else {
     await Promise.all(