diff options
author | Luca Casonato <hello@lcas.dev> | 2023-08-08 16:28:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-08 16:28:18 -0400 |
commit | 03e963f57831367a39996c7d88bc9875e97d52d7 (patch) | |
tree | 8920cda4906ad9300550679d2492f0023d0beabc /ext/node | |
parent | f2e30a6f7999fa6ce4ab789266927e3abbb48e3f (diff) |
chore: rename some helpers on the Fs trait (#20097)
Rename some of the helper methods on the Fs trait to be suffixed with
`_sync` / `_async`, in preparation of the introduction of more async
methods for some helpers.
Also adds a `read_text_file_async` helper to complement the renamed
`read_text_file_sync` helper.
Diffstat (limited to 'ext/node')
-rw-r--r-- | ext/node/analyze.rs | 14 | ||||
-rw-r--r-- | ext/node/ops/require.rs | 4 | ||||
-rw-r--r-- | ext/node/package_json.rs | 2 | ||||
-rw-r--r-- | ext/node/resolution.rs | 20 |
4 files changed, 20 insertions, 20 deletions
diff --git a/ext/node/analyze.rs b/ext/node/analyze.rs index 902fe9f44..3648756f0 100644 --- a/ext/node/analyze.rs +++ b/ext/node/analyze.rs @@ -205,7 +205,7 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer> NodeCodeTranslator<TCjsCodeAnalyzer> { )?; let package_json_path = module_dir.join("package.json"); - if self.fs.exists(&package_json_path) { + if self.fs.exists_sync(&package_json_path) { let package_json = PackageJson::load( &*self.fs, &*self.npm_resolver, @@ -229,10 +229,10 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer> NodeCodeTranslator<TCjsCodeAnalyzer> { // old school if package_subpath != "." { let d = module_dir.join(package_subpath); - if self.fs.is_dir(&d) { + if self.fs.is_dir_sync(&d) { // subdir might have a package.json that specifies the entrypoint let package_json_path = d.join("package.json"); - if self.fs.exists(&package_json_path) { + if self.fs.exists_sync(&package_json_path) { let package_json = PackageJson::load( &*self.fs, &*self.npm_resolver, @@ -262,13 +262,13 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer> NodeCodeTranslator<TCjsCodeAnalyzer> { referrer: &Path, ) -> Result<PathBuf, AnyError> { let p = p.clean(); - if self.fs.exists(&p) { + if self.fs.exists_sync(&p) { let file_name = p.file_name().unwrap(); let p_js = p.with_file_name(format!("{}.js", file_name.to_str().unwrap())); - if self.fs.is_file(&p_js) { + if self.fs.is_file_sync(&p_js) { return Ok(p_js); - } else if self.fs.is_dir(&p) { + } else if self.fs.is_dir_sync(&p) { return Ok(p.join("index.js")); } else { return Ok(p); @@ -276,7 +276,7 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer> NodeCodeTranslator<TCjsCodeAnalyzer> { } else if let Some(file_name) = p.file_name() { let p_js = p.with_file_name(format!("{}.js", file_name.to_str().unwrap())); - if self.fs.is_file(&p_js) { + if self.fs.is_file_sync(&p_js) { return Ok(p_js); } } diff --git a/ext/node/ops/require.rs b/ext/node/ops/require.rs index f758ec973..f91970eef 100644 --- a/ext/node/ops/require.rs +++ b/ext/node/ops/require.rs @@ -426,7 +426,7 @@ where let file_path = PathBuf::from(file_path); ensure_read_permission::<P>(state, &file_path)?; let fs = state.borrow::<FileSystemRc>(); - Ok(fs.read_to_string(&file_path)?) + Ok(fs.read_text_file_sync(&file_path)?) } #[op] @@ -466,7 +466,7 @@ where } else { let original = modules_path.clone(); let mod_dir = path_resolve(vec![modules_path, name]); - if fs.is_dir(Path::new(&mod_dir)) { + if fs.is_dir_sync(Path::new(&mod_dir)) { mod_dir } else { original diff --git a/ext/node/package_json.rs b/ext/node/package_json.rs index 95ca8b561..ae5e159a1 100644 --- a/ext/node/package_json.rs +++ b/ext/node/package_json.rs @@ -81,7 +81,7 @@ impl PackageJson { return Ok(CACHE.with(|cache| cache.borrow()[&path].clone())); } - let source = match fs.read_to_string(&path) { + let source = match fs.read_text_file_sync(&path) { Ok(source) => source, Err(err) if err.kind() == ErrorKind::NotFound => { return Ok(PackageJson::empty(path)); diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 6e4637286..4c43fcbad 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -534,20 +534,20 @@ impl NodeResolver { let mut searched_for_d_cts = false; if lowercase_path.ends_with(".mjs") { let d_mts_path = with_known_extension(path, "d.mts"); - if fs.exists(&d_mts_path) { + if fs.exists_sync(&d_mts_path) { return Some(d_mts_path); } searched_for_d_mts = true; } else if lowercase_path.ends_with(".cjs") { let d_cts_path = with_known_extension(path, "d.cts"); - if fs.exists(&d_cts_path) { + if fs.exists_sync(&d_cts_path) { return Some(d_cts_path); } searched_for_d_cts = true; } let dts_path = with_known_extension(path, "d.ts"); - if fs.exists(&dts_path) { + if fs.exists_sync(&dts_path) { return Some(dts_path); } @@ -561,7 +561,7 @@ impl NodeResolver { _ => None, // already searched above }; if let Some(specific_dts_path) = specific_dts_path { - if fs.exists(&specific_dts_path) { + if fs.exists_sync(&specific_dts_path) { return Some(specific_dts_path); } } @@ -580,7 +580,7 @@ impl NodeResolver { { return Some(path); } - if self.fs.is_dir(&path) { + if self.fs.is_dir_sync(&path) { let index_path = path.join("index.js"); if let Some(path) = probe_extensions( &*self.fs, @@ -1163,7 +1163,7 @@ impl NodeResolver { ); let mut current_dir = current_dir.as_path(); let package_json_path = current_dir.join("package.json"); - if self.fs.exists(&package_json_path) { + if self.fs.exists_sync(&package_json_path) { return Ok(Some(package_json_path)); } let Some(root_pkg_folder) = self @@ -1174,7 +1174,7 @@ impl NodeResolver { while current_dir.starts_with(&root_pkg_folder) { current_dir = current_dir.parent().unwrap(); let package_json_path = current_dir.join("package.json"); - if self.fs.exists(&package_json_path) { + if self.fs.exists_sync(&package_json_path) { return Ok(Some(package_json_path)); } } @@ -1224,7 +1224,7 @@ impl NodeResolver { if let Some(main) = maybe_main { let guess = package_json.path.parent().unwrap().join(main).clean(); - if self.fs.is_file(&guess) { + if self.fs.is_file_sync(&guess) { return Ok(Some(guess)); } @@ -1253,7 +1253,7 @@ impl NodeResolver { .unwrap() .join(format!("{main}{ending}")) .clean(); - if self.fs.is_file(&guess) { + if self.fs.is_file_sync(&guess) { // TODO(bartlomieju): emitLegacyIndexDeprecation() return Ok(Some(guess)); } @@ -1276,7 +1276,7 @@ impl NodeResolver { .unwrap() .join(index_file_name) .clean(); - if self.fs.is_file(&guess) { + if self.fs.is_file_sync(&guess) { // TODO(bartlomieju): emitLegacyIndexDeprecation() return Ok(Some(guess)); } |