Correctly detect empty folder

GoogleChromeLabs · Feb 20, 2023 · b52e7bf · b52e7bf
1 parent fa13784
commit b52e7bf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browser-fs-access",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "description": "File System Access API with legacy fallback in the browser.",
   "type": "module",
   "source": "./src/index.js",

diff --git a/src/fs-access/directory-open.mjs b/src/fs-access/directory-open.mjs
@@ -60,11 +60,10 @@ export default async (options = {}) => {
     startIn: options.startIn,
     mode: options.mode,
   });
-  const files = getFiles(
-    handle,
-    options.recursive,
-    undefined,
-    options.skipDirectory
-  );
-  return handle.values ? files : [handle];
+  // If the directory is empty, return an array with the handle.
+  if ((await (await handle.values()).next()).done) {
+    return [handle];
+  }
+  // Else, return an array of File objects.
+  return getFiles(handle, options.recursive, undefined, options.skipDirectory);
 };