foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

feat(std/fs): Re-enable followSymlinks on walk() (#8479)

Browse source
This commit is contained in:
Liam Murphy 2020-12-01 01:34:36 +11:00 • committed by GitHub
parent acdfc71d00
commit 7a4d0fc22b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
std/fs/walk.ts
View file

@ -106,18 +106,17 @@ export async function* walk(
return; return;
} }
for await (const entry of Deno.readDir(root)) { for await (const entry of Deno.readDir(root)) {
assert(entry.name != null);
let path = join(root, entry.name);
if (entry.isSymlink) { if (entry.isSymlink) {
if (followSymlinks) { if (followSymlinks) {
// TODO(ry) Re-enable followSymlinks. path = await Deno.realPath(path);
throw new Error("unimplemented");
} else { } else {
continue; continue;
} }
} }
assert(entry.name != null);
const path = join(root, entry.name);
if (entry.isFile) { if (entry.isFile) {
if (includeFiles && include(path, exts, match, skip)) { if (includeFiles && include(path, exts, match, skip)) {
yield { path, ...entry }; yield { path, ...entry };
@ -159,17 +158,17 @@ export function* walkSync(
return; return;
} }
for (const entry of Deno.readDirSync(root)) { for (const entry of Deno.readDirSync(root)) {
assert(entry.name != null);
let path = join(root, entry.name);
if (entry.isSymlink) { if (entry.isSymlink) {
if (followSymlinks) { if (followSymlinks) {
throw new Error("unimplemented"); path = Deno.realPathSync(path);
} else { } else {
continue; continue;
} }
} }
assert(entry.name != null);
const path = join(root, entry.name);
if (entry.isFile) { if (entry.isFile) {
if (includeFiles && include(path, exts, match, skip)) { if (includeFiles && include(path, exts, match, skip)) {
yield { path, ...entry }; yield { path, ...entry };

5
std/fs/walk_test.ts
View file

@ -252,12 +252,11 @@ testWalk(
async function symlink(): Promise<void> { async function symlink(): Promise<void> {
assertReady(6); assertReady(6);
const files = await walkArray("a"); const files = await walkArray("a");
assertEquals(files.length, 2); assertEquals(files.length, 3);
assert(!files.includes("a/bb/z")); assert(!files.includes("a/bb/z"));
const arr = await walkArray("a", { followSymlinks: true }); const arr = await walkArray("a", { followSymlinks: true });
assertEquals(arr.length, 3); assertEquals(arr.length, 5);
assert(arr.some((f): boolean => f.endsWith("/b/z"))); assert(arr.some((f): boolean => f.endsWith("/b/z")));
}, },
true,
); );