From aa286fdecb15461ef8ddd4c372f5a13e01e1cb7b Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 24 Apr 2023 19:44:35 -0400 Subject: refactor(ext/node): allow injecting `NodeFs` from CLI (#18829) This allows providing a `NodeFs` as part of the `WorkerOptions`. --- ext/node/package_json.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ext/node/package_json.rs') diff --git a/ext/node/package_json.rs b/ext/node/package_json.rs index 08f78681a..0e34897e3 100644 --- a/ext/node/package_json.rs +++ b/ext/node/package_json.rs @@ -62,16 +62,18 @@ impl PackageJson { } } - pub fn load( + pub fn load( + fs: &dyn NodeFs, resolver: &dyn NpmResolver, permissions: &mut dyn NodePermissions, path: PathBuf, ) -> Result { resolver.ensure_read_permission(permissions, &path)?; - Self::load_skip_read_permission::(path) + Self::load_skip_read_permission(fs, path) } - pub fn load_skip_read_permission( + pub fn load_skip_read_permission( + fs: &dyn NodeFs, path: PathBuf, ) -> Result { assert!(path.is_absolute()); @@ -80,7 +82,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_to_string(&path) { Ok(source) => source, Err(err) if err.kind() == ErrorKind::NotFound => { return Ok(PackageJson::empty(path)); -- cgit v1.2.3