fix(s3fs): local file system list should be recursive by default (#1822)

linz · Aug 20, 2021 · 9367e3f · 9367e3f
1 parent 83488af
commit 9367e3f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/linzjs-s3fs/src/abstractions/file.local.ts b/packages/linzjs-s3fs/src/abstractions/file.local.ts
@@ -21,8 +21,12 @@ export class FsLocal implements FileSystem {
 
     async *list(filePath: string): AsyncGenerator<string> {
         try {
-            const files = await fs.promises.readdir(filePath);
-            for (const file of files) yield path.join(filePath, file);
+            const files = await fs.promises.readdir(filePath, { withFileTypes: true });
+            for (const file of files) {
+                const targetPath = path.join(filePath, file.name);
+                if (file.isDirectory()) yield* this.list(targetPath);
+                else yield targetPath;
+            }
         } catch (e) {
             throw getCompositeError(e, `Failed to list: ${filePath}`);
         }
@@ -32,11 +36,7 @@ export class FsLocal implements FileSystem {
         for await (const file of this.list(filePath)) {
             const res = await this.head(file);
             if (res == null) continue;
-            if (res.isDirectory) {
-                yield* this.listDetails(res.path);
-            } else {
-                yield res;
-            }
+            yield res;
         }
     }