[v18.x backport] fs: fix the file name is not included when the withFileTypes option of readdir

lib/internal/fs/dir.js

@@ -155,16 +155,16 @@ class Dir {
           path,
           result[i],
           result[i + 1],
-          true, // Quirk to not introduce a breaking change.
         ),
       );
     }
   }
 
   readSyncRecursive(dirent) {
-    const ctx = { path: dirent.path };
+    const path = pathModule.join(dirent.path, dirent.name);
+    const ctx = { path };
     const handle = dirBinding.opendir(
-      pathModule.toNamespacedPath(dirent.path),
+      pathModule.toNamespacedPath(path),
       this[kDirOptions].encoding,
       undefined,
       ctx,
@@ -178,7 +178,7 @@ class Dir {
     );
 
     if (result) {
-      this.processReadResult(dirent.path, result);
+      this.processReadResult(path, result);
     }
 
     handle.close(undefined, ctx);

lib/internal/fs/utils.js

@@ -161,10 +161,10 @@ function assertEncoding(encoding) {
 }
 
 class Dirent {
-  constructor(name, type, path, filepath = path && join(path, name)) {
+  constructor(name, type, path) {
     this.name = name;
     this.parentPath = path;
-    this.path = filepath;
+    this.path = path;
     this[kType] = type;
   }
 
@@ -198,8 +198,8 @@ class Dirent {
 }
 
 class DirentFromStats extends Dirent {
-  constructor(name, stats, path, filepath) {
-    super(name, null, path, filepath);
+  constructor(name, stats, path) {
+    super(name, null, path);
     this[kStats] = stats;
   }
 }
@@ -269,7 +269,7 @@ function getDirents(path, { 0: names, 1: types }, callback) {
             callback(err);
             return;
           }
-          names[idx] = new DirentFromStats(name, stats, path, filepath);
+          names[idx] = new DirentFromStats(name, stats, path);
           if (--toFinish === 0) {
             callback(null, names);
           }
@@ -305,21 +305,17 @@ function getDirent(path, name, type, callback) {
           callback(err);
           return;
         }
-        callback(null, new DirentFromStats(name, stats, path, filepath));
+        callback(null, new DirentFromStats(name, stats, path));
       });
     } else {
       callback(null, new Dirent(name, type, path));
     }
   } else if (type === UV_DIRENT_UNKNOWN) {
     const filepath = join(path, name);
     const stats = lazyLoadFs().lstatSync(filepath);
-    // callback === true: Quirk to not introduce a breaking change.
-    return new DirentFromStats(name, stats, path, callback === true ? filepath : path);
-  } else if (callback === true) {
-    // callback === true: Quirk to not introduce a breaking change.
-    return new Dirent(name, type, path);
+    return new DirentFromStats(name, stats, path);
   } else {
-    return new Dirent(name, type, path, path);
+    return new Dirent(name, type, path);
   }
 }
 

test/parallel/test-fs-opendir.js

@@ -51,7 +51,7 @@ const invalidCallbackObj = {
     return { name: dirent.name, path: dirent.path, parentPath: dirent.parentPath, toString() { return dirent.name; } };
   }).sort();
   assert.deepStrictEqual(entries.map((d) => d.name), files);
-  assert.deepStrictEqual(entries.map((d) => d.path), files.map((name) => path.join(testDir, name)));
+  assert.deepStrictEqual(entries.map((d) => d.path), Array(entries.length).fill(testDir));
   assert.deepStrictEqual(entries.map((d) => d.parentPath), Array(entries.length).fill(testDir));
 
   // dir.read should return null when no more entries exist