GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — fs: correctly pass dirent to exclude `withFileTypes` · nodejs/node@b377b93

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal/fs
- glob.js
test/parallel
- test-fs-glob.mjs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/internal/fs/glob.js‎`

Copy file name to clipboardExpand all lines: lib/internal/fs/glob.js

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ class Glob {`
`542`	`542`	`const fromSymlink = 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()) {`

Collapse file

`‎test/parallel/test-fs-glob.mjs‎`

Copy file name to clipboardExpand all lines: test/parallel/test-fs-glob.mjs

+15-3Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,11 @@ describe('glob - withFileTypes', function() {`
`342`	`342`	`const promisified = promisify(glob);`
`343`	`343`	`for (const [pattern, expected] of Object.entries(patterns)) {`
`344`	`344`	`test(pattern, async () => {`
`345`		`- const actual = await promisified(pattern, { cwd: fixtureDir, withFileTypes: true });`
	`345`	`+ const actual = await promisified(pattern, {`
	`346`	`+ cwd: fixtureDir,`
	`347`	`+ withFileTypes: true,`
	`348`	`+ exclude: (dirent) => assert.ok(dirent instanceof Dirent),`
	`349`	`+ });`
`346`	`350`	`assertDirents(actual);`
`347`	`351`	`const normalized = expected.filter(Boolean).map((item) => basename(item)).sort();`
`348`	`352`	`assert.deepStrictEqual(actual.map((dirent) => dirent.name).sort(), normalized.sort());`
`@@ -353,7 +357,11 @@ describe('glob - withFileTypes', function() {`
`353`	`357`	`describe('globSync - withFileTypes', function() {`
`354`	`358`	`for (const [pattern, expected] of Object.entries(patterns)) {`
`355`	`359`	`test(pattern, () => {`
`356`		`- const actual = globSync(pattern, { cwd: fixtureDir, withFileTypes: true });`
	`360`	`+ const actual = globSync(pattern, {`
	`361`	`+ cwd: fixtureDir,`
	`362`	`+ withFileTypes: true,`
	`363`	`+ exclude: (dirent) => assert.ok(dirent instanceof Dirent),`
	`364`	`+ });`
`357`	`365`	`assertDirents(actual);`
`358`	`366`	`const normalized = expected.filter(Boolean).map((item) => basename(item)).sort();`
`359`	`367`	`assert.deepStrictEqual(actual.map((dirent) => dirent.name).sort(), normalized.sort());`
`@@ -365,7 +373,11 @@ describe('fsPromises glob - withFileTypes', function() {`
`365`	`373`	`for (const [pattern, expected] of Object.entries(patterns)) {`
`366`	`374`	`test(pattern, async () => {`
`367`	`375`	`const actual = [];`
`368`		`- for await (const item of asyncGlob(pattern, { cwd: fixtureDir, withFileTypes: true })) actual.push(item);`
	`376`	`+ for await (const item of asyncGlob(pattern, {`
	`377`	`+ cwd: fixtureDir,`
	`378`	`+ withFileTypes: true,`
	`379`	`+ exclude: (dirent) => assert.ok(dirent instanceof Dirent),`
	`380`	`+ })) actual.push(item);`
`369`	`381`	`assertDirents(actual);`
`370`	`382`	`const normalized = expected.filter(Boolean).map((item) => basename(item)).sort();`
`371`	`383`	`assert.deepStrictEqual(actual.map((dirent) => dirent.name).sort(), normalized.sort());`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.