-
Notifications
You must be signed in to change notification settings - Fork 675
fix(fs): walk does not apply exts filter to directories #7167
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
LeSingh1
wants to merge
1
commit into
denoland:main
Choose a base branch
from
LeSingh1:fs-walk-exts-skip-dirs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+30
−5
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -113,23 +113,42 @@ Deno.test("walkSync() accepts includeFiles option set to false", () => | |
| includeFiles: false, | ||
| })); | ||
|
|
||
| // `includeDirs` defaults to true, so the root directory entry is also | ||
| // expected. `exts` no longer filters directories (see #6736). | ||
| Deno.test("walk() accepts ext option as strings", async () => | ||
| await assertWalkPaths(testdataDir, "ext", ["y.rs", "x.ts"], { | ||
| await assertWalkPaths(testdataDir, "ext", [".", "y.rs", "x.ts"], { | ||
| exts: [".rs", ".ts"], | ||
| })); | ||
|
|
||
| Deno.test("walk() accepts ext option as strings (excluding period prefix)", async () => | ||
| await assertWalkPaths(testdataDir, "ext", ["y.rs", "x.ts"], { | ||
| await assertWalkPaths(testdataDir, "ext", [".", "y.rs", "x.ts"], { | ||
| exts: ["rs", "ts"], | ||
| })); | ||
|
|
||
| Deno.test("walkSync() accepts ext option as strings", () => | ||
| assertWalkSyncPaths(testdataDir, "ext", ["y.rs", "x.ts"], { | ||
| assertWalkSyncPaths(testdataDir, "ext", [".", "y.rs", "x.ts"], { | ||
| exts: [".rs", ".ts"], | ||
| })); | ||
|
|
||
| Deno.test("walkSync() accepts ext option as strings (excluding period prefix)", () => | ||
| assertWalkSyncPaths(testdataDir, "ext", [".", "y.rs", "x.ts"], { | ||
| exts: [".rs", ".ts"], | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pre-existing copy-paste error (optional fix-along): this |
||
| })); | ||
|
|
||
| // https://github.com/denoland/std/issues/6736 — explicit includeDirs:false | ||
| // still drops the directory when an `exts` filter is set. Before the fix, | ||
| // includeDirs:true also dropped it (because the dir name had no extension); | ||
| // after the fix, the dir is yielded as expected (verified by the strings | ||
| // tests above). | ||
| Deno.test("walk() with exts and includeDirs:false yields only files", async () => | ||
| await assertWalkPaths(testdataDir, "ext", ["y.rs", "x.ts"], { | ||
| includeDirs: false, | ||
| exts: [".rs", ".ts"], | ||
| })); | ||
|
|
||
| Deno.test("walkSync() with exts and includeDirs:false yields only files", () => | ||
| assertWalkSyncPaths(testdataDir, "ext", ["y.rs", "x.ts"], { | ||
| includeDirs: false, | ||
| exts: [".rs", ".ts"], | ||
| })); | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same class of bug still exists for symlinks-to-directories in the
!followSymlinksbranch below (fs/walk.ts:488and:920):include(path, exts, match, skip)still appliesextsto the symlink entry. A symlink pointing at a directory has no extension, soincludeSymlinks: true+extswill silently drop it — exactly the issue you're fixing here.The PR description's justification ("a symlink's name still has an extension just like the target") isn't accurate for symlinks-to-directories. Either handle it consistently here, or — if you'd rather defer it — soften that line in the description so it doesn't read as verified-correct.