mirror of
https://github.com/denoland/deno.git
synced 2024-12-22 07:14:47 -05:00
fix(ext/node): Add Dirent.path and Dirent.parentPath (#24257)
This commit is contained in:
parent
1d6b775f81
commit
209b286813
5 changed files with 25 additions and 0 deletions
|
@ -764,6 +764,7 @@ impl FileBackedVfs {
|
||||||
.entries
|
.entries
|
||||||
.iter()
|
.iter()
|
||||||
.map(|entry| FsDirEntry {
|
.map(|entry| FsDirEntry {
|
||||||
|
parent_path: path.to_string_lossy().into_owned(),
|
||||||
name: entry.name().to_string(),
|
name: entry.name().to_string(),
|
||||||
is_file: matches!(entry, VfsEntry::File(_)),
|
is_file: matches!(entry, VfsEntry::File(_)),
|
||||||
is_directory: matches!(entry, VfsEntry::Dir(_)),
|
is_directory: matches!(entry, VfsEntry::Dir(_)),
|
||||||
|
|
|
@ -72,6 +72,7 @@ pub enum FsFileType {
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct FsDirEntry {
|
pub struct FsDirEntry {
|
||||||
|
pub parent_path: String,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub is_file: bool,
|
pub is_file: bool,
|
||||||
pub is_directory: bool,
|
pub is_directory: bool,
|
||||||
|
|
|
@ -785,6 +785,7 @@ fn read_dir(path: &Path) -> FsResult<Vec<FsDirEntry>> {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
Some(FsDirEntry {
|
Some(FsDirEntry {
|
||||||
|
parent_path: path.to_string_lossy().to_string(),
|
||||||
name,
|
name,
|
||||||
is_file: method_or_false!(is_file),
|
is_file: method_or_false!(is_file),
|
||||||
is_directory: method_or_false!(is_dir),
|
is_directory: method_or_false!(is_dir),
|
||||||
|
|
|
@ -43,4 +43,13 @@ export default class Dirent {
|
||||||
get name(): string | null {
|
get name(): string | null {
|
||||||
return this.entry.name;
|
return this.entry.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get parentPath(): string {
|
||||||
|
return this.entry.parentPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @deprecated */
|
||||||
|
get path(): string {
|
||||||
|
return this.parentPath;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ import { Dirent as Dirent_ } from "node:fs";
|
||||||
const Dirent = Dirent_ as any;
|
const Dirent = Dirent_ as any;
|
||||||
|
|
||||||
class DirEntryMock implements Deno.DirEntry {
|
class DirEntryMock implements Deno.DirEntry {
|
||||||
|
parentPath = "";
|
||||||
name = "";
|
name = "";
|
||||||
isFile = false;
|
isFile = false;
|
||||||
isDirectory = false;
|
isDirectory = false;
|
||||||
|
@ -80,3 +81,15 @@ Deno.test({
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Deno.test({
|
||||||
|
name: "Path and parent path is correct",
|
||||||
|
fn() {
|
||||||
|
const entry: DirEntryMock = new DirEntryMock();
|
||||||
|
entry.name = "my_file";
|
||||||
|
entry.parentPath = "/home/user";
|
||||||
|
assertEquals(new Dirent(entry).name, "my_file");
|
||||||
|
assertEquals(new Dirent(entry).path, "/home/user");
|
||||||
|
assertEquals(new Dirent(entry).parentPath, "/home/user");
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in a new issue