fs: pass correct path to DirentFromStats during glob

PR-URL: #55071
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>

Author: avivkeller

lib/internal/fs/glob.js

@@ -16,7 +16,7 @@ const {
 
 const{ lstatSync, readdirSync }=require('fs');
 const{ lstat, readdir }=require('fs/promises');
-const{ join, resolve, basename, isAbsolute }=require('path');
+const{ join, resolve, basename, isAbsolute, dirname}=require('path');
 
 const{
  kEmptyObject,
@@ -48,7 +48,7 @@ async function getDirent(path) {
 }catch{
 returnnull;
 }
-returnnewDirentFromStats(basename(path),stat,path);
+returnnewDirentFromStats(basename(path),stat,dirname(path));
 }
 
 /**
@@ -60,7 +60,7 @@ function getDirentSync(path) {
 if(stat===undefined){
 returnnull;
 }
-returnnewDirentFromStats(basename(path),stat,path);
+returnnewDirentFromStats(basename(path),stat,dirname(path));
 }
 
 classCache{

test/parallel/test-fs-glob.mjs

@@ -1,6 +1,6 @@
 import*ascommonfrom'../common/index.mjs';
 importtmpdirfrom'../common/tmpdir.js';
-import{resolve,dirname,sep,basename}from'node:path';
+import{resolve,dirname,sep,relative,join,isAbsolute}from'node:path';
 import{mkdir,writeFile,symlink,globasasyncGlob}from'node:fs/promises';
 import{glob,globSync,Dirent}from'node:fs';
 import{test,describe}from'node:test';
@@ -338,6 +338,11 @@ describe('fsPromises glob', function() {
 }
 });
 
+constnormalizeDirent=(dirent)=>relative(fixtureDir,join(dirent.parentPath,dirent.name));
+// The call to `join()` with only one argument is important, as
+// it ensures that the proper path seperators are applied.
+constnormalizePath=(path)=>(isAbsolute(path) ? relative(fixtureDir,path) : join(path));
+
 describe('glob - withFileTypes',function(){
 constpromisified=promisify(glob);
 for(const[pattern,expected]ofObject.entries(patterns)){
@@ -348,8 +353,7 @@ describe('glob - withFileTypes', function() {
 exclude: (dirent)=>assert.ok(direntinstanceofDirent),
 });
 assertDirents(actual);
-constnormalized=expected.filter(Boolean).map((item)=>basename(item)).sort();
-assert.deepStrictEqual(actual.map((dirent)=>dirent.name).sort(),normalized.sort());
+assert.deepStrictEqual(actual.map(normalizeDirent).sort(),expected.filter(Boolean).map(normalizePath).sort());
 });
 }
 });
@@ -363,8 +367,7 @@ describe('globSync - withFileTypes', function() {
 exclude: (dirent)=>assert.ok(direntinstanceofDirent),
 });
 assertDirents(actual);
-constnormalized=expected.filter(Boolean).map((item)=>basename(item)).sort();
-assert.deepStrictEqual(actual.map((dirent)=>dirent.name).sort(),normalized.sort());
+assert.deepStrictEqual(actual.map(normalizeDirent).sort(),expected.filter(Boolean).map(normalizePath).sort());
 });
 }
 });
@@ -379,8 +382,7 @@ describe('fsPromises glob - withFileTypes', function() {
 exclude: (dirent)=>assert.ok(direntinstanceofDirent),
 }))actual.push(item);
 assertDirents(actual);
-constnormalized=expected.filter(Boolean).map((item)=>basename(item)).sort();
-assert.deepStrictEqual(actual.map((dirent)=>dirent.name).sort(),normalized.sort());
+assert.deepStrictEqual(actual.map(normalizeDirent).sort(),expected.filter(Boolean).map(normalizePath).sort());
 });
 }
 });