diff options
Diffstat (limited to 'ext/node/resolution.rs')
| -rw-r--r-- | ext/node/resolution.rs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/ext/node/resolution.rs b/ext/node/resolution.rs index 20501b0f1..4272b8c86 100644 --- a/ext/node/resolution.rs +++ b/ext/node/resolution.rs @@ -15,9 +15,10 @@ use deno_core::url::Url; use deno_core::ModuleSpecifier; use deno_fs::FileSystemRc; use deno_media_type::MediaType; -use deno_semver::npm::NpmPackageNv; use deno_semver::npm::NpmPackageNvReference; use deno_semver::npm::NpmPackageReqReference; +use deno_semver::package::PackageNv; +use deno_semver::package::PackageNvReference; use crate::errors; use crate::AllowAllNodePermissions; @@ -336,11 +337,11 @@ impl NodeResolver { ) -> Result<Option<NodeResolution>, AnyError> { let pkg_id = self .npm_resolver - .resolve_pkg_id_from_pkg_req(&reference.req)?; - let reference = NpmPackageNvReference { + .resolve_pkg_id_from_pkg_req(reference.req())?; + let reference = NpmPackageNvReference::new(PackageNvReference { nv: pkg_id.nv, - sub_path: reference.sub_path.clone(), - }; + sub_path: reference.sub_path().map(ToOwned::to_owned), + }); self.resolve_npm_reference(&reference, mode, permissions) } @@ -352,13 +353,12 @@ impl NodeResolver { ) -> Result<Option<NodeResolution>, AnyError> { let package_folder = self .npm_resolver - .resolve_package_folder_from_deno_module(&reference.nv)?; + .resolve_package_folder_from_deno_module(reference.nv())?; let node_module_kind = NodeModuleKind::Esm; let maybe_resolved_path = self .package_config_resolve( &reference - .sub_path - .as_ref() + .sub_path() .map(|s| format!("./{s}")) .unwrap_or_else(|| ".".to_string()), &package_folder, @@ -392,7 +392,7 @@ impl NodeResolver { pub fn resolve_binary_commands( &self, - pkg_nv: &NpmPackageNv, + pkg_nv: &PackageNv, ) -> Result<Vec<String>, AnyError> { let package_folder = self .npm_resolver @@ -416,9 +416,9 @@ impl NodeResolver { ) -> Result<NodeResolution, AnyError> { let pkg_nv = self .npm_resolver - .resolve_pkg_id_from_pkg_req(&pkg_ref.req)? + .resolve_pkg_id_from_pkg_req(pkg_ref.req())? .nv; - let bin_name = pkg_ref.sub_path.as_deref(); + let bin_name = pkg_ref.sub_path(); let package_folder = self .npm_resolver .resolve_package_folder_from_deno_module(&pkg_nv)?; @@ -1288,7 +1288,7 @@ impl NodeResolver { } fn resolve_bin_entry_value<'a>( - pkg_nv: &NpmPackageNv, + pkg_nv: &PackageNv, bin_name: Option<&str>, bin: &'a Value, ) -> Result<&'a str, AnyError> { @@ -1600,7 +1600,7 @@ mod tests { }); assert_eq!( resolve_bin_entry_value( - &NpmPackageNv::from_str("test@1.1.1").unwrap(), + &PackageNv::from_str("test@1.1.1").unwrap(), Some("bin1"), &value ) @@ -1611,7 +1611,7 @@ mod tests { // should resolve the value with the same name when not specified assert_eq!( resolve_bin_entry_value( - &NpmPackageNv::from_str("test@1.1.1").unwrap(), + &PackageNv::from_str("test@1.1.1").unwrap(), None, &value ) @@ -1622,7 +1622,7 @@ mod tests { // should not resolve when specified value does not exist assert_eq!( resolve_bin_entry_value( - &NpmPackageNv::from_str("test@1.1.1").unwrap(), + &PackageNv::from_str("test@1.1.1").unwrap(), Some("other"), &value ) @@ -1642,7 +1642,7 @@ mod tests { // should not resolve when default value can't be determined assert_eq!( resolve_bin_entry_value( - &NpmPackageNv::from_str("asdf@1.2.3").unwrap(), + &PackageNv::from_str("asdf@1.2.3").unwrap(), None, &value ) @@ -1666,7 +1666,7 @@ mod tests { }); assert_eq!( resolve_bin_entry_value( - &NpmPackageNv::from_str("test@1.2.3").unwrap(), + &PackageNv::from_str("test@1.2.3").unwrap(), None, &value ) @@ -1678,7 +1678,7 @@ mod tests { let value = json!("./value"); assert_eq!( resolve_bin_entry_value( - &NpmPackageNv::from_str("test@1.2.3").unwrap(), + &PackageNv::from_str("test@1.2.3").unwrap(), Some("path"), &value ) |