language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-31 15:57:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(compile): ensure atime/birthtime/mtime/ctime is set in vfs (#28731)

Browse source 
Co-authored-by: XYCode <xycode-xyc@outlook.com>
This commit is contained in:
David Sherret 2025-04-04 09:50:44 -04:00 • committed by GitHub
parent dca9f7c0c3
commit becf24c8c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 96 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

43
cli/lib/standalone/virtual_fs.rs
View file

@ -5,8 +5,10 @@ use std::collections::hash_map::Entry;
use std::collections::HashMap;
use std::collections::VecDeque;
use std::fmt;
use std::io::Read;
use std::path::Path;
use std::path::PathBuf;
use std::time::SystemTime;
use deno_path_util::normalize_path;
use deno_path_util::strip_unc_prefix;
@ -260,6 +262,8 @@ pub struct VirtualFile {
pub cjs_export_analysis_offset: Option<OffsetWithLength>,
#[serde(rename = "s", skip_serializing_if = "Option::is_none")]
pub source_map_offset: Option<OffsetWithLength>,
#[serde(rename = "t", skip_serializing_if = "Option::is_none")]
pub mtime: Option<u128>, // mtime in milliseconds
}
#[derive(Debug, Serialize, Deserialize)]
@ -432,6 +436,7 @@ impl FilesData {
pub struct AddFileDataOptions {
pub data: Vec<u8>,
pub mtime: Option<SystemTime>,
pub maybe_transpiled: Option<Vec<u8>>,
pub maybe_source_map: Option<Vec<u8>>,
pub maybe_cjs_export_analysis: Option<Vec<u8>>,
@ -639,14 +644,12 @@ impl VfsBuilder {
}
pub fn add_file_at_path(&mut self, path: &Path) -> Result<(), AnyError> {
// ok, building fs implementation
#[allow(clippy::disallowed_methods)]
let file_bytes = std::fs::read(path)
.with_context(|| format!("Reading {}", path.display()))?;
let (file_bytes, mtime) = self.read_file_bytes_and_mtime(path)?;
self.add_file_with_data(
path,
AddFileDataOptions {
data: file_bytes,
mtime,
maybe_cjs_export_analysis: None,
maybe_transpiled: None,
maybe_source_map: None,
@ -658,11 +661,28 @@ impl VfsBuilder {
&mut self,
path: &Path,
) -> Result<(), AnyError> {
let (file_bytes, mtime) = self.read_file_bytes_and_mtime(path)?;
self.add_file_with_data_raw(path, file_bytes, mtime)
}
fn read_file_bytes_and_mtime(
&self,
path: &Path,
) -> Result<(Vec<u8>, Option<SystemTime>), AnyError> {
// ok, building fs implementation
#[allow(clippy::disallowed_methods)]
let file_bytes = std::fs::read(path)
.with_context(|| format!("Reading {}", path.display()))?;
self.add_file_with_data_raw(path, file_bytes)
{
let mut file = std::fs::OpenOptions::new()
.read(true)
.open(path)
.with_context(|| format!("Opening {}", path.display()))?;
let mtime = file.metadata().ok().and_then(|m| m.modified().ok());
let mut file_bytes = Vec::new();
file
.read_to_end(&mut file_bytes)
.with_context(|| format!("Reading {}", path.display()))?;
Ok((file_bytes, mtime))
}
}
pub fn add_file_with_data(
@ -687,11 +707,13 @@ impl VfsBuilder {
&mut self,
path: &Path,
data: Vec<u8>,
mtime: Option<SystemTime>,
) -> Result<(), AnyError> {
self.add_file_with_data_raw_options(
path,
AddFileDataOptions {
data,
mtime,
maybe_transpiled: None,
maybe_cjs_export_analysis: None,
maybe_source_map: None,
@ -720,6 +742,11 @@ impl VfsBuilder {
let dir = self.add_dir_raw(path.parent().unwrap());
let name = path.file_name().unwrap().to_string_lossy();
let mtime = options
.mtime
.and_then(|mtime| mtime.duration_since(std::time::UNIX_EPOCH).ok())
.map(|m| m.as_millis());
dir.entries.insert_or_modify(
&name,
case_sensitivity,
@ -730,6 +757,7 @@ impl VfsBuilder {
transpiled_offset,
cjs_export_analysis_offset,
source_map_offset,
mtime,
})
},
|entry| match entry {
@ -746,6 +774,7 @@ impl VfsBuilder {
virtual_file.cjs_export_analysis_offset =
cjs_export_analysis_offset;
}
virtual_file.mtime = mtime;
}
VfsEntry::Dir(_) | VfsEntry::Symlink(_) => unreachable!(),
},