fs: pass correct path to DirentFromStats during glob

avivkeller · aduh95 · commit 45f960cab6e3 · 2024-10-23T22:54:20.000+02:00
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>
diff --git a/lib/internal/fs/glob.js b/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 {
     return null;
   }
-  return new DirentFromStats(basename(path), stat, path);
+  return new DirentFromStats(basename(path), stat, dirname(path));
 }
 
 /**
@@ -60,7 +60,7 @@ function getDirentSync(path) {
   if (stat === undefined) {
     return null;
   }
-  return new DirentFromStats(basename(path), stat, path);
+  return new DirentFromStats(basename(path), stat, dirname(path));
 }
 
 class Cache {
diff --git a/test/parallel/test-fs-glob.mjs b/test/parallel/test-fs-glob.mjs
@@ -1,6 +1,6 @@
 import * as common from '../common/index.mjs';
 import tmpdir from '../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, glob as asyncGlob } 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() {
   }
 });
 
+const normalizeDirent = (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.
+const normalizePath = (path) => (isAbsolute(path) ? relative(fixtureDir, path) : join(path));
+
 describe('glob - withFileTypes', function() {
   const promisified = promisify(glob);
   for (const [pattern, expected] of Object.entries(patterns)) {
@@ -348,8 +353,7 @@ describe('glob - withFileTypes', function() {
         exclude: (dirent) => assert.ok(dirent instanceof Dirent),
       });
       assertDirents(actual);
-      const normalized = 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(dirent instanceof Dirent),
       });
       assertDirents(actual);
-      const normalized = 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(dirent instanceof Dirent),
       })) actual.push(item);
       assertDirents(actual);
-      const normalized = 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());
     });
   }
 });

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ const {`
`16`	`16`
`17`	`17`	`const { lstatSync, readdirSync } = require('fs');`
`18`	`18`	`const { lstat, readdir } = require('fs/promises');`
`19`		`-const { join, resolve, basename, isAbsolute } = require('path');`
	`19`	`+const { join, resolve, basename, isAbsolute, dirname } = require('path');`
`20`	`20`
`21`	`21`	`const {`
`22`	`22`	`kEmptyObject,`
`@@ -48,7 +48,7 @@ async function getDirent(path) {`
`48`	`48`	`} catch {`
`49`	`49`	`return null;`
`50`	`50`	`}`
`51`		`- return new DirentFromStats(basename(path), stat, path);`
	`51`	`+ return new DirentFromStats(basename(path), stat, dirname(path));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`@@ -60,7 +60,7 @@ function getDirentSync(path) {`
`60`	`60`	`if (stat === undefined) {`
`61`	`61`	`return null;`
`62`	`62`	`}`
`63`		`- return new DirentFromStats(basename(path), stat, path);`
	`63`	`+ return new DirentFromStats(basename(path), stat, dirname(path));`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`class Cache {`