summaryrefslogtreecommitdiff
path: root/std/fs
diff options
context:
space:
mode:
Diffstat (limited to 'std/fs')
-rw-r--r--std/fs/copy.ts41
-rw-r--r--std/fs/copy_test.ts16
-rw-r--r--std/fs/empty_dir.ts7
-rw-r--r--std/fs/empty_dir_test.ts16
-rw-r--r--std/fs/ensure_dir.ts4
-rw-r--r--std/fs/ensure_file.ts4
-rw-r--r--std/fs/ensure_link_test.ts8
-rw-r--r--std/fs/ensure_symlink_test.ts20
-rw-r--r--std/fs/expand_glob.ts44
-rw-r--r--std/fs/move.ts4
-rw-r--r--std/fs/utils.ts6
-rw-r--r--std/fs/walk.ts36
-rw-r--r--std/fs/walk_test.ts4
13 files changed, 102 insertions, 108 deletions
diff --git a/std/fs/copy.ts b/std/fs/copy.ts
index b199e9167..05ce4b12c 100644
--- a/std/fs/copy.ts
+++ b/std/fs/copy.ts
@@ -35,7 +35,7 @@ async function ensureValidCopy(
throw err;
}
- if (isCopyFolder && !destStat.isDirectory()) {
+ if (isCopyFolder && !destStat.isDirectory) {
throw new Error(
`Cannot overwrite non-directory '${dest}' with directory '${src}'.`
);
@@ -63,7 +63,7 @@ function ensureValidCopySync(
throw err;
}
- if (isCopyFolder && !destStat.isDirectory()) {
+ if (isCopyFolder && !destStat.isDirectory) {
throw new Error(
`Cannot overwrite non-directory '${dest}' with directory '${src}'.`
);
@@ -157,17 +157,14 @@ async function copyDir(
await Deno.utime(dest, srcStatInfo.accessed, srcStatInfo.modified);
}
- const files = await Deno.readdir(src);
-
- for (const file of files) {
- assert(file.name != null, "file.name must be set");
+ for await (const file of Deno.readdir(src)) {
const srcPath = path.join(src, file.name);
const destPath = path.join(dest, path.basename(srcPath as string));
- if (file.isDirectory()) {
+ if (file.isDirectory) {
await copyDir(srcPath, destPath, options);
- } else if (file.isFile()) {
+ } else if (file.isFile) {
await copyFile(srcPath, destPath, options);
- } else if (file.isSymlink()) {
+ } else if (file.isSymlink) {
await copySymLink(srcPath, destPath, options);
}
}
@@ -188,17 +185,15 @@ function copyDirSync(src: string, dest: string, options: CopyOptions): void {
Deno.utimeSync(dest, srcStatInfo.accessed, srcStatInfo.modified);
}
- const files = Deno.readdirSync(src);
-
- for (const file of files) {
+ for (const file of Deno.readdirSync(src)) {
assert(file.name != null, "file.name must be set");
const srcPath = path.join(src, file.name);
const destPath = path.join(dest, path.basename(srcPath as string));
- if (file.isDirectory()) {
+ if (file.isDirectory) {
copyDirSync(srcPath, destPath, options);
- } else if (file.isFile()) {
+ } else if (file.isFile) {
copyFileSync(srcPath, destPath, options);
- } else if (file.isSymlink()) {
+ } else if (file.isSymlink) {
copySymlinkSync(srcPath, destPath, options);
}
}
@@ -228,17 +223,17 @@ export async function copy(
const srcStat = await Deno.lstat(src);
- if (srcStat.isDirectory() && isSubdir(src, dest)) {
+ if (srcStat.isDirectory && isSubdir(src, dest)) {
throw new Error(
`Cannot copy '${src}' to a subdirectory of itself, '${dest}'.`
);
}
- if (srcStat.isDirectory()) {
+ if (srcStat.isDirectory) {
await copyDir(src, dest, options);
- } else if (srcStat.isFile()) {
+ } else if (srcStat.isFile) {
await copyFile(src, dest, options);
- } else if (srcStat.isSymlink()) {
+ } else if (srcStat.isSymlink) {
await copySymLink(src, dest, options);
}
}
@@ -267,17 +262,17 @@ export function copySync(
const srcStat = Deno.lstatSync(src);
- if (srcStat.isDirectory() && isSubdir(src, dest)) {
+ if (srcStat.isDirectory && isSubdir(src, dest)) {
throw new Error(
`Cannot copy '${src}' to a subdirectory of itself, '${dest}'.`
);
}
- if (srcStat.isDirectory()) {
+ if (srcStat.isDirectory) {
copyDirSync(src, dest, options);
- } else if (srcStat.isFile()) {
+ } else if (srcStat.isFile) {
copyFileSync(src, dest, options);
- } else if (srcStat.isSymlink()) {
+ } else if (srcStat.isSymlink) {
copySymlinkSync(src, dest, options);
}
}
diff --git a/std/fs/copy_test.ts b/std/fs/copy_test.ts
index 0fbc90579..65e36a5fc 100644
--- a/std/fs/copy_test.ts
+++ b/std/fs/copy_test.ts
@@ -266,7 +266,7 @@ testCopy(
}
assert(
- (await Deno.lstat(srcLink)).isSymlink(),
+ (await Deno.lstat(srcLink)).isSymlink,
`'${srcLink}' should be symlink type`
);
@@ -274,7 +274,7 @@ testCopy(
const statInfo = await Deno.lstat(destLink);
- assert(statInfo.isSymlink(), `'${destLink}' should be symlink type`);
+ assert(statInfo.isSymlink, `'${destLink}' should be symlink type`);
}
);
@@ -296,7 +296,7 @@ testCopy(
await ensureSymlink(srcDir, srcLink);
assert(
- (await Deno.lstat(srcLink)).isSymlink(),
+ (await Deno.lstat(srcLink)).isSymlink,
`'${srcLink}' should be symlink type`
);
@@ -304,7 +304,7 @@ testCopy(
const statInfo = await Deno.lstat(destLink);
- assert(statInfo.isSymlink());
+ assert(statInfo.isSymlink);
}
);
@@ -506,7 +506,7 @@ testCopySync(
}
assert(
- Deno.lstatSync(srcLink).isSymlink(),
+ Deno.lstatSync(srcLink).isSymlink,
`'${srcLink}' should be symlink type`
);
@@ -514,7 +514,7 @@ testCopySync(
const statInfo = Deno.lstatSync(destLink);
- assert(statInfo.isSymlink(), `'${destLink}' should be symlink type`);
+ assert(statInfo.isSymlink, `'${destLink}' should be symlink type`);
}
);
@@ -536,7 +536,7 @@ testCopySync(
ensureSymlinkSync(originDir, srcLink);
assert(
- Deno.lstatSync(srcLink).isSymlink(),
+ Deno.lstatSync(srcLink).isSymlink,
`'${srcLink}' should be symlink type`
);
@@ -544,6 +544,6 @@ testCopySync(
const statInfo = Deno.lstatSync(destLink);
- assert(statInfo.isSymlink());
+ assert(statInfo.isSymlink);
}
);
diff --git a/std/fs/empty_dir.ts b/std/fs/empty_dir.ts
index 78b7a42f4..5e860c65f 100644
--- a/std/fs/empty_dir.ts
+++ b/std/fs/empty_dir.ts
@@ -10,7 +10,10 @@ const { readdir, readdirSync, mkdir, mkdirSync, remove, removeSync } = Deno;
*/
export async function emptyDir(dir: string): Promise<void> {
try {
- const items = await readdir(dir);
+ const items = [];
+ for await (const dirEntry of readdir(dir)) {
+ items.push(dirEntry);
+ }
while (items.length) {
const item = items.shift();
@@ -38,7 +41,7 @@ export async function emptyDir(dir: string): Promise<void> {
*/
export function emptyDirSync(dir: string): void {
try {
- const items = readdirSync(dir);
+ const items = [...readdirSync(dir)];
// if directory already exist. then remove it's child item.
while (items.length) {
diff --git a/std/fs/empty_dir_test.ts b/std/fs/empty_dir_test.ts
index f30f434df..59b12fbc9 100644
--- a/std/fs/empty_dir_test.ts
+++ b/std/fs/empty_dir_test.ts
@@ -20,7 +20,7 @@ Deno.test(async function emptyDirIfItNotExist(): Promise<void> {
try {
// check the dir
const stat = await Deno.stat(testNestDir);
- assertEquals(stat.isDirectory(), true);
+ assertEquals(stat.isDirectory, true);
} finally {
// remove the test dir
await Deno.remove(testDir, { recursive: true });
@@ -36,7 +36,7 @@ Deno.test(function emptyDirSyncIfItNotExist(): void {
try {
// check the dir
const stat = Deno.statSync(testNestDir);
- assertEquals(stat.isDirectory(), true);
+ assertEquals(stat.isDirectory, true);
} finally {
// remove the test dir
Deno.removeSync(testDir, { recursive: true });
@@ -54,10 +54,10 @@ Deno.test(async function emptyDirIfItExist(): Promise<void> {
// before empty: make sure file/directory exist
const beforeFileStat = await Deno.stat(testDirFile);
- assertEquals(beforeFileStat.isFile(), true);
+ assertEquals(beforeFileStat.isFile, true);
const beforeDirStat = await Deno.stat(testNestDir);
- assertEquals(beforeDirStat.isDirectory(), true);
+ assertEquals(beforeDirStat.isDirectory, true);
await emptyDir(testDir);
@@ -65,7 +65,7 @@ Deno.test(async function emptyDirIfItExist(): Promise<void> {
try {
// test dir still there
const stat = await Deno.stat(testDir);
- assertEquals(stat.isDirectory(), true);
+ assertEquals(stat.isDirectory, true);
// nest directory have been remove
await assertThrowsAsync(
@@ -97,10 +97,10 @@ Deno.test(function emptyDirSyncIfItExist(): void {
// before empty: make sure file/directory exist
const beforeFileStat = Deno.statSync(testDirFile);
- assertEquals(beforeFileStat.isFile(), true);
+ assertEquals(beforeFileStat.isFile, true);
const beforeDirStat = Deno.statSync(testNestDir);
- assertEquals(beforeDirStat.isDirectory(), true);
+ assertEquals(beforeDirStat.isDirectory, true);
emptyDirSync(testDir);
@@ -108,7 +108,7 @@ Deno.test(function emptyDirSyncIfItExist(): void {
try {
// test dir still there
const stat = Deno.statSync(testDir);
- assertEquals(stat.isDirectory(), true);
+ assertEquals(stat.isDirectory, true);
// nest directory have been remove
assertThrows((): void => {
diff --git a/std/fs/ensure_dir.ts b/std/fs/ensure_dir.ts
index a74261c61..ecc7356ef 100644
--- a/std/fs/ensure_dir.ts
+++ b/std/fs/ensure_dir.ts
@@ -10,7 +10,7 @@ const { lstat, lstatSync, mkdir, mkdirSync } = Deno;
export async function ensureDir(dir: string): Promise<void> {
try {
const fileInfo = await lstat(dir);
- if (!fileInfo.isDirectory()) {
+ if (!fileInfo.isDirectory) {
throw new Error(
`Ensure path exists, expected 'dir', got '${getFileInfoType(fileInfo)}'`
);
@@ -33,7 +33,7 @@ export async function ensureDir(dir: string): Promise<void> {
export function ensureDirSync(dir: string): void {
try {
const fileInfo = lstatSync(dir);
- if (!fileInfo.isDirectory()) {
+ if (!fileInfo.isDirectory) {
throw new Error(
`Ensure path exists, expected 'dir', got '${getFileInfoType(fileInfo)}'`
);
diff --git a/std/fs/ensure_file.ts b/std/fs/ensure_file.ts
index 77732164a..de6cab500 100644
--- a/std/fs/ensure_file.ts
+++ b/std/fs/ensure_file.ts
@@ -16,7 +16,7 @@ export async function ensureFile(filePath: string): Promise<void> {
try {
// if file exists
const stat = await lstat(filePath);
- if (!stat.isFile()) {
+ if (!stat.isFile) {
throw new Error(
`Ensure path exists, expected 'file', got '${getFileInfoType(stat)}'`
);
@@ -47,7 +47,7 @@ export function ensureFileSync(filePath: string): void {
try {
// if file exists
const stat = lstatSync(filePath);
- if (!stat.isFile()) {
+ if (!stat.isFile) {
throw new Error(
`Ensure path exists, expected 'file', got '${getFileInfoType(stat)}'`
);
diff --git a/std/fs/ensure_link_test.ts b/std/fs/ensure_link_test.ts
index 3c7720dc0..235650ebf 100644
--- a/std/fs/ensure_link_test.ts
+++ b/std/fs/ensure_link_test.ts
@@ -50,8 +50,8 @@ Deno.test(async function ensureLinkIfItExist(): Promise<void> {
const srcStat = await Deno.lstat(testFile);
const linkStat = await Deno.lstat(linkFile);
- assertEquals(srcStat.isFile(), true);
- assertEquals(linkStat.isFile(), true);
+ assertEquals(srcStat.isFile, true);
+ assertEquals(linkStat.isFile, true);
// har link success. try to change one of them. they should be change both.
@@ -98,8 +98,8 @@ Deno.test(function ensureLinkSyncIfItExist(): void {
const linkStat = Deno.lstatSync(linkFile);
- assertEquals(srcStat.isFile(), true);
- assertEquals(linkStat.isFile(), true);
+ assertEquals(srcStat.isFile, true);
+ assertEquals(linkStat.isFile, true);
// har link success. try to change one of them. they should be change both.
diff --git a/std/fs/ensure_symlink_test.ts b/std/fs/ensure_symlink_test.ts
index 5188dc035..bbd31ef24 100644
--- a/std/fs/ensure_symlink_test.ts
+++ b/std/fs/ensure_symlink_test.ts
@@ -67,8 +67,8 @@ Deno.test(async function ensureSymlinkIfItExist(): Promise<void> {
const srcStat = await Deno.lstat(testFile);
const linkStat = await Deno.lstat(linkFile);
- assertEquals(srcStat.isFile(), true);
- assertEquals(linkStat.isSymlink(), true);
+ assertEquals(srcStat.isFile, true);
+ assertEquals(linkStat.isSymlink, true);
await Deno.remove(testDir, { recursive: true });
});
@@ -97,8 +97,8 @@ Deno.test(function ensureSymlinkSyncIfItExist(): void {
const linkStat = Deno.lstatSync(linkFile);
- assertEquals(srcStat.isFile(), true);
- assertEquals(linkStat.isSymlink(), true);
+ assertEquals(srcStat.isFile, true);
+ assertEquals(linkStat.isSymlink, true);
Deno.removeSync(testDir, { recursive: true });
});
@@ -127,9 +127,9 @@ Deno.test(async function ensureSymlinkDirectoryIfItExist(): Promise<void> {
const linkDirStat = await Deno.lstat(linkDir);
const testFileStat = await Deno.lstat(testFile);
- assertEquals(testFileStat.isFile(), true);
- assertEquals(testDirStat.isDirectory(), true);
- assertEquals(linkDirStat.isSymlink(), true);
+ assertEquals(testFileStat.isFile, true);
+ assertEquals(testDirStat.isDirectory, true);
+ assertEquals(linkDirStat.isSymlink, true);
await Deno.remove(linkDir, { recursive: true });
await Deno.remove(testDir, { recursive: true });
@@ -159,9 +159,9 @@ Deno.test(function ensureSymlinkSyncDirectoryIfItExist(): void {
const linkDirStat = Deno.lstatSync(linkDir);
const testFileStat = Deno.lstatSync(testFile);
- assertEquals(testFileStat.isFile(), true);
- assertEquals(testDirStat.isDirectory(), true);
- assertEquals(linkDirStat.isSymlink(), true);
+ assertEquals(testFileStat.isFile, true);
+ assertEquals(testDirStat.isDirectory, true);
+ assertEquals(linkDirStat.isSymlink, true);
Deno.removeSync(linkDir, { recursive: true });
Deno.removeSync(testDir, { recursive: true });
diff --git a/std/fs/expand_glob.ts b/std/fs/expand_glob.ts
index 10a8c2c52..386f61ad5 100644
--- a/std/fs/expand_glob.ts
+++ b/std/fs/expand_glob.ts
@@ -8,7 +8,7 @@ import {
joinGlobs,
normalize,
} from "../path/mod.ts";
-import { WalkInfo, walk, walkSync } from "./walk.ts";
+import { WalkEntry, walk, walkSync } from "./walk.ts";
import { assert } from "../testing/asserts.ts";
const { cwd, stat, statSync } = Deno;
type FileInfo = Deno.FileInfo;
@@ -50,7 +50,7 @@ function throwUnlessNotFound(error: Error): void {
/**
* Expand the glob string from the specified `root` directory and yield each
- * result as a `WalkInfo` object.
+ * result as a `WalkEntry` object.
*/
export async function* expandGlob(
glob: string,
@@ -61,7 +61,7 @@ export async function* expandGlob(
extended = false,
globstar = false,
}: ExpandGlobOptions = {}
-): AsyncIterableIterator<WalkInfo> {
+): AsyncIterableIterator<WalkEntry> {
const globOptions: GlobOptions = { extended, globstar };
const absRoot = isAbsolute(root)
? normalize(root)
@@ -84,7 +84,7 @@ export async function* expandGlob(
fixedRoot = joinGlobs([fixedRoot, seg], globOptions);
}
- let fixedRootInfo: WalkInfo;
+ let fixedRootInfo: WalkEntry;
try {
fixedRootInfo = { filename: fixedRoot, info: await stat(fixedRoot) };
} catch (error) {
@@ -92,10 +92,10 @@ export async function* expandGlob(
}
async function* advanceMatch(
- walkInfo: WalkInfo,
+ walkInfo: WalkEntry,
globSegment: string
- ): AsyncIterableIterator<WalkInfo> {
- if (!walkInfo.info.isDirectory()) {
+ ): AsyncIterableIterator<WalkEntry> {
+ if (!walkInfo.info.isDirectory) {
return;
} else if (globSegment == "..") {
const parentPath = joinGlobs([walkInfo.filename, ".."], globOptions);
@@ -125,7 +125,7 @@ export async function* expandGlob(
});
}
- let currentMatches: WalkInfo[] = [fixedRootInfo];
+ let currentMatches: WalkEntry[] = [fixedRootInfo];
for (const segment of segments) {
// Advancing the list of current matches may introduce duplicates, so we
// pass everything through this Map.
@@ -136,20 +136,20 @@ export async function* expandGlob(
}
}
currentMatches = [...nextMatchMap].sort().map(
- ([filename, info]): WalkInfo => ({
+ ([filename, info]): WalkEntry => ({
filename,
info,
})
);
}
if (hasTrailingSep) {
- currentMatches = currentMatches.filter(({ info }): boolean =>
- info.isDirectory()
+ currentMatches = currentMatches.filter(
+ ({ info }): boolean => info.isDirectory
);
}
if (!includeDirs) {
currentMatches = currentMatches.filter(
- ({ info }): boolean => !info.isDirectory()
+ ({ info }): boolean => !info.isDirectory
);
}
yield* currentMatches;
@@ -165,7 +165,7 @@ export function* expandGlobSync(
extended = false,
globstar = false,
}: ExpandGlobOptions = {}
-): IterableIterator<WalkInfo> {
+): IterableIterator<WalkEntry> {
const globOptions: GlobOptions = { extended, globstar };
const absRoot = isAbsolute(root)
? normalize(root)
@@ -188,7 +188,7 @@ export function* expandGlobSync(
fixedRoot = joinGlobs([fixedRoot, seg], globOptions);
}
- let fixedRootInfo: WalkInfo;
+ let fixedRootInfo: WalkEntry;
try {
fixedRootInfo = { filename: fixedRoot, info: statSync(fixedRoot) };
} catch (error) {
@@ -196,10 +196,10 @@ export function* expandGlobSync(
}
function* advanceMatch(
- walkInfo: WalkInfo,
+ walkInfo: WalkEntry,
globSegment: string
- ): IterableIterator<WalkInfo> {
- if (!walkInfo.info.isDirectory()) {
+ ): IterableIterator<WalkEntry> {
+ if (!walkInfo.info.isDirectory) {
return;
} else if (globSegment == "..") {
const parentPath = joinGlobs([walkInfo.filename, ".."], globOptions);
@@ -229,7 +229,7 @@ export function* expandGlobSync(
});
}
- let currentMatches: WalkInfo[] = [fixedRootInfo];
+ let currentMatches: WalkEntry[] = [fixedRootInfo];
for (const segment of segments) {
// Advancing the list of current matches may introduce duplicates, so we
// pass everything through this Map.
@@ -240,20 +240,20 @@ export function* expandGlobSync(
}
}
currentMatches = [...nextMatchMap].sort().map(
- ([filename, info]): WalkInfo => ({
+ ([filename, info]): WalkEntry => ({
filename,
info,
})
);
}
if (hasTrailingSep) {
- currentMatches = currentMatches.filter(({ info }): boolean =>
- info.isDirectory()
+ currentMatches = currentMatches.filter(
+ ({ info }): boolean => info.isDirectory
);
}
if (!includeDirs) {
currentMatches = currentMatches.filter(
- ({ info }): boolean => !info.isDirectory()
+ ({ info }): boolean => !info.isDirectory
);
}
yield* currentMatches;
diff --git a/std/fs/move.ts b/std/fs/move.ts
index 48b1ef5f2..ee9498fd3 100644
--- a/std/fs/move.ts
+++ b/std/fs/move.ts
@@ -14,7 +14,7 @@ export async function move(
): Promise<void> {
const srcStat = await Deno.stat(src);
- if (srcStat.isDirectory() && isSubdir(src, dest)) {
+ if (srcStat.isDirectory && isSubdir(src, dest)) {
throw new Error(
`Cannot move '${src}' to a subdirectory of itself, '${dest}'.`
);
@@ -41,7 +41,7 @@ export function moveSync(
): void {
const srcStat = Deno.statSync(src);
- if (srcStat.isDirectory() && isSubdir(src, dest)) {
+ if (srcStat.isDirectory && isSubdir(src, dest)) {
throw new Error(
`Cannot move '${src}' to a subdirectory of itself, '${dest}'.`
);
diff --git a/std/fs/utils.ts b/std/fs/utils.ts
index ff11fbf13..48a98a0b1 100644
--- a/std/fs/utils.ts
+++ b/std/fs/utils.ts
@@ -35,11 +35,11 @@ export type PathType = "file" | "dir" | "symlink";
* `lstat`
*/
export function getFileInfoType(fileInfo: Deno.FileInfo): PathType | undefined {
- return fileInfo.isFile()
+ return fileInfo.isFile
? "file"
- : fileInfo.isDirectory()
+ : fileInfo.isDirectory
? "dir"
- : fileInfo.isSymlink()
+ : fileInfo.isSymlink
? "symlink"
: undefined;
}
diff --git a/std/fs/walk.ts b/std/fs/walk.ts
index 3f178c0c5..e4cf4674f 100644
--- a/std/fs/walk.ts
+++ b/std/fs/walk.ts
@@ -4,7 +4,6 @@
import { unimplemented, assert } from "../testing/asserts.ts";
import { join } from "../path/mod.ts";
const { readdir, readdirSync, stat, statSync } = Deno;
-type FileInfo = Deno.FileInfo;
export interface WalkOptions {
maxDepth?: number;
@@ -34,9 +33,9 @@ function include(
return true;
}
-export interface WalkInfo {
+export interface WalkEntry {
filename: string;
- info: FileInfo;
+ info: Deno.FileInfo;
}
/** Walks the file tree rooted at root, yielding each file or directory in the
@@ -55,7 +54,7 @@ export interface WalkInfo {
*
* for await (const { filename, info } of walk(".")) {
* console.log(filename);
- * assert(info.isFile());
+ * assert(info.isFile);
* };
*/
export async function* walk(
@@ -69,7 +68,7 @@ export async function* walk(
match = undefined,
skip = undefined,
}: WalkOptions = {}
-): AsyncIterableIterator<WalkInfo> {
+): AsyncIterableIterator<WalkEntry> {
if (maxDepth < 0) {
return;
}
@@ -79,9 +78,8 @@ export async function* walk(
if (maxDepth < 1 || !include(root, undefined, undefined, skip)) {
return;
}
- const ls: FileInfo[] = await readdir(root);
- for (const info of ls) {
- if (info.isSymlink()) {
+ for await (const dirEntry of readdir(root)) {
+ if (dirEntry.isSymlink) {
if (followSymlinks) {
// TODO(ry) Re-enable followSymlinks.
unimplemented();
@@ -90,12 +88,11 @@ export async function* walk(
}
}
- assert(info.name != null);
- const filename = join(root, info.name);
+ const filename = join(root, dirEntry.name);
- if (info.isFile()) {
+ if (dirEntry.isFile) {
if (includeFiles && include(filename, exts, match, skip)) {
- yield { filename, info };
+ yield { filename, info: dirEntry };
}
} else {
yield* walk(filename, {
@@ -123,7 +120,7 @@ export function* walkSync(
match = undefined,
skip = undefined,
}: WalkOptions = {}
-): IterableIterator<WalkInfo> {
+): IterableIterator<WalkEntry> {
if (maxDepth < 0) {
return;
}
@@ -133,9 +130,8 @@ export function* walkSync(
if (maxDepth < 1 || !include(root, undefined, undefined, skip)) {
return;
}
- const ls: FileInfo[] = readdirSync(root);
- for (const info of ls) {
- if (info.isSymlink()) {
+ for (const dirEntry of readdirSync(root)) {
+ if (dirEntry.isSymlink) {
if (followSymlinks) {
unimplemented();
} else {
@@ -143,12 +139,12 @@ export function* walkSync(
}
}
- assert(info.name != null);
- const filename = join(root, info.name);
+ assert(dirEntry.name != null);
+ const filename = join(root, dirEntry.name);
- if (info.isFile()) {
+ if (dirEntry.isFile) {
if (includeFiles && include(filename, exts, match, skip)) {
- yield { filename, info };
+ yield { filename, info: dirEntry };
}
} else {
yield* walkSync(filename, {
diff --git a/std/fs/walk_test.ts b/std/fs/walk_test.ts
index 453e2c5c4..6a44f5514 100644
--- a/std/fs/walk_test.ts
+++ b/std/fs/walk_test.ts
@@ -1,6 +1,6 @@
const { cwd, chdir, makeTempDir, mkdir, open, symlink } = Deno;
const { remove } = Deno;
-import { walk, walkSync, WalkOptions, WalkInfo } from "./walk.ts";
+import { walk, walkSync, WalkOptions, WalkEntry } from "./walk.ts";
import { assert, assertEquals, assertThrowsAsync } from "../testing/asserts.ts";
const isWindows = Deno.build.os == "win";
@@ -26,7 +26,7 @@ export function testWalk(
Deno.test({ ignore, name: `[walk] ${name}`, fn });
}
-function normalize({ filename }: WalkInfo): string {
+function normalize({ filename }: WalkEntry): string {
return filename.replace(/\\/g, "/");
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 16:54:24 +0000