fix: fix handle paths in FSA entries iterator (#1019)

* fix: fix file handle path in FSA entries iterator * Fix directory handle paths and add assertions
streamich · Mar 31, 2024 · b8905eb · b8905eb
1 parent cf9b0b3
commit b8905eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/node-to-fsa/NodeFileSystemDirectoryHandle.ts b/src/node-to-fsa/NodeFileSystemDirectoryHandle.ts
@@ -57,9 +57,9 @@ export class NodeFileSystemDirectoryHandle extends NodeFileSystemHandle implemen
     for (const d of list) {
       const dirent = d as Dirent;
       const name = dirent.name + '';
-      const newPath = path + ctx.separator! + name;
+      const newPath = path + name;
       if (dirent.isDirectory()) yield [name, new NodeFileSystemDirectoryHandle(fs, newPath, ctx)];
-      else if (dirent.isFile()) yield [name, new NodeFileSystemFileHandle(fs, name, ctx)];
+      else if (dirent.isFile()) yield [name, new NodeFileSystemFileHandle(fs, newPath, ctx)];
     }
   }
 

diff --git a/src/node-to-fsa/__tests__/NodeFileSystemDirectoryHandle.test.ts b/src/node-to-fsa/__tests__/NodeFileSystemDirectoryHandle.test.ts
@@ -64,6 +64,7 @@ onlyOnNode20('NodeFileSystemDirectoryHandle', () => {
         expect(subdir).toBeInstanceOf(NodeFileSystemDirectoryHandle);
         expect(subdir.kind).toBe('directory');
         expect(subdir.name).toBe('My Documents');
+        expect((subdir as NodeFileSystemDirectoryHandle).__path).toBe('/My Documents/');
       }
     });
 
@@ -76,6 +77,7 @@ onlyOnNode20('NodeFileSystemDirectoryHandle', () => {
         expect(file).toBeInstanceOf(NodeFileSystemFileHandle);
         expect(file.kind).toBe('file');
         expect(file.name).toBe('file.txt');
+        await expect((file as NodeFileSystemFileHandle).getFile()).resolves.toBeInstanceOf(File);
       }
     });