fs: correctly pass dirent to exclude withFileTypes

avivkeller · targos · commit b377b93a3fa3 · 2024-07-28T08:53:27.000+02:00
PR-URL: #53823 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
diff --git a/lib/internal/fs/glob.js b/lib/internal/fs/glob.js
@@ -542,7 +542,7 @@ class Glob {
 const fromSymlink = pattern.symlinks.has(index);
 
 if (current === lazyMinimatch().GLOBSTAR) {
- if (entry.name[0] === '.' || (this.#exclude && this.#exclude(entry.name))) {
+ if (entry.name[0] === '.' || (this.#exclude && this.#exclude(this.#withFileTypes ? entry : entry.name))) {
 continue;
 }
 if (!fromSymlink && entry.isDirectory()) {
diff --git a/test/parallel/test-fs-glob.mjs b/test/parallel/test-fs-glob.mjs
@@ -342,7 +342,11 @@ describe('glob - withFileTypes', function() {
 const promisified = promisify(glob);
 for (const [pattern, expected] of Object.entries(patterns)) {
 test(pattern, async () => {
- const actual = await promisified(pattern, { cwd: fixtureDir, withFileTypes: true });
+ const actual = await promisified(pattern, {
+ cwd: fixtureDir,
+ withFileTypes: true,
+ 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());
@@ -353,7 +357,11 @@ describe('glob - withFileTypes', function() {
 describe('globSync - withFileTypes', function() {
 for (const [pattern, expected] of Object.entries(patterns)) {
 test(pattern, () => {
- const actual = globSync(pattern, { cwd: fixtureDir, withFileTypes: true });
+ const actual = globSync(pattern, {
+ cwd: fixtureDir,
+ withFileTypes: true,
+ 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());
@@ -365,7 +373,11 @@ describe('fsPromises glob - withFileTypes', function() {
 for (const [pattern, expected] of Object.entries(patterns)) {
 test(pattern, async () => {
 const actual = [];
- for await (const item of asyncGlob(pattern, { cwd: fixtureDir, withFileTypes: true })) actual.push(item);
+ for await (const item of asyncGlob(pattern, {
+ cwd: fixtureDir,
+ withFileTypes: true,
+ 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());

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ class Glob {`
`542`	`542`	`constfromSymlink=pattern.symlinks.has(index);`
`543`	`543`
`544`	`544`	`if(current===lazyMinimatch().GLOBSTAR){`
`545`		`-if(entry.name[0]==='.'\|\|(this.#exclude &&this.#exclude(entry.name))){`
	`545`	`+if(entry.name[0]==='.'\|\|(this.#exclude &&this.#exclude(this.#withFileTypes ? entry : entry.name))){`
`546`	`546`	`continue;`
`547`	`547`	`}`
`548`	`548`	`if(!fromSymlink&&entry.isDirectory()){`
-Original file line number
+Diff line change
 constpromisified=promisify(glob);
 for(const[pattern,expected]ofObject.entries(patterns)){
 test(pattern,async()=>{
 -constactual=awaitpromisified(pattern,{cwd: fixtureDir,withFileTypes: true});
 +constactual=awaitpromisified(pattern,{
 +cwd: fixtureDir,
 +withFileTypes: true,
 +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());
 describe('globSync - withFileTypes',function(){
 for(const[pattern,expected]ofObject.entries(patterns)){
 test(pattern,()=>{
 -constactual=globSync(pattern,{cwd: fixtureDir,withFileTypes: true});
 +constactual=globSync(pattern,{
 +cwd: fixtureDir,
 +withFileTypes: true,
 +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());
 for(const[pattern,expected]ofObject.entries(patterns)){
 test(pattern,async()=>{
 constactual=[];
 -forawait(constitemofasyncGlob(pattern,{cwd: fixtureDir,withFileTypes: true}))actual.push(item);
 +forawait(constitemofasyncGlob(pattern,{
 +cwd: fixtureDir,
 +withFileTypes: true,
 +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());