diff options
Diffstat (limited to 'cli/npm/resolvers')
-rw-r--r-- | cli/npm/resolvers/local.rs | 16 | ||||
-rw-r--r-- | cli/npm/resolvers/mod.rs | 20 |
2 files changed, 15 insertions, 21 deletions
diff --git a/cli/npm/resolvers/local.rs b/cli/npm/resolvers/local.rs index 6a0065ba8..71b91c452 100644 --- a/cli/npm/resolvers/local.rs +++ b/cli/npm/resolvers/local.rs @@ -37,7 +37,7 @@ use deno_runtime::deno_fs; use deno_runtime::deno_node::NodePermissions; use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::PackageJson; -use deno_semver::npm::NpmPackageNv; +use deno_semver::package::PackageNv; use serde::Deserialize; use serde::Serialize; @@ -657,7 +657,7 @@ fn get_package_folder_id_from_folder_name( }; let version = deno_semver::Version::parse_from_npm(raw_version).ok()?; Some(NpmPackageCacheFolderId { - nv: NpmPackageNv { name, version }, + nv: PackageNv { name, version }, copy_index, }) } @@ -726,7 +726,7 @@ fn join_package_name(path: &Path, package_name: &str) -> PathBuf { #[cfg(test)] mod test { use deno_npm::NpmPackageCacheFolderId; - use deno_semver::npm::NpmPackageNv; + use deno_semver::package::PackageNv; use test_util::TempDir; use super::*; @@ -736,20 +736,14 @@ mod test { let cases = vec![ ( NpmPackageCacheFolderId { - nv: NpmPackageNv { - name: "@types/foo".to_string(), - version: deno_semver::Version::parse_standard("1.2.3").unwrap(), - }, + nv: PackageNv::from_str("@types/foo@1.2.3").unwrap(), copy_index: 1, }, "@types+foo@1.2.3_1".to_string(), ), ( NpmPackageCacheFolderId { - nv: NpmPackageNv { - name: "JSON".to_string(), - version: deno_semver::Version::parse_standard("3.2.1").unwrap(), - }, + nv: PackageNv::from_str("JSON@3.2.1").unwrap(), copy_index: 0, }, "_jjju6tq@3.2.1".to_string(), diff --git a/cli/npm/resolvers/mod.rs b/cli/npm/resolvers/mod.rs index 1b3f57c9a..58a70dff0 100644 --- a/cli/npm/resolvers/mod.rs +++ b/cli/npm/resolvers/mod.rs @@ -25,8 +25,8 @@ use deno_runtime::deno_node::NodePermissions; use deno_runtime::deno_node::NodeResolutionMode; use deno_runtime::deno_node::NpmResolver; use deno_runtime::deno_node::PathClean; -use deno_semver::npm::NpmPackageNv; -use deno_semver::npm::NpmPackageReq; +use deno_semver::package::PackageNv; +use deno_semver::package::PackageReq; use global::GlobalNpmPackageResolver; use serde::Deserialize; use serde::Serialize; @@ -91,7 +91,7 @@ impl CliNpmResolver { } /// Checks if the provided package req's folder is cached. - pub fn is_pkg_req_folder_cached(&self, req: &NpmPackageReq) -> bool { + pub fn is_pkg_req_folder_cached(&self, req: &PackageReq) -> bool { self .resolve_pkg_id_from_pkg_req(req) .ok() @@ -102,7 +102,7 @@ impl CliNpmResolver { pub fn resolve_pkg_id_from_pkg_req( &self, - req: &NpmPackageReq, + req: &PackageReq, ) -> Result<NpmPackageId, PackageReqNotFoundError> { self.resolution.resolve_pkg_id_from_pkg_req(req) } @@ -182,7 +182,7 @@ impl CliNpmResolver { /// Adds package requirements to the resolver and ensures everything is setup. pub async fn add_package_reqs( &self, - packages: &[NpmPackageReq], + packages: &[PackageReq], ) -> Result<(), AnyError> { if packages.is_empty() { return Ok(()); @@ -205,7 +205,7 @@ impl CliNpmResolver { /// This will retrieve and resolve package information, but not cache any package files. pub async fn set_package_reqs( &self, - packages: &[NpmPackageReq], + packages: &[PackageReq], ) -> Result<(), AnyError> { self.resolution.set_package_reqs(packages).await } @@ -225,7 +225,7 @@ impl CliNpmResolver { .unwrap() } - pub fn package_reqs(&self) -> HashMap<NpmPackageReq, NpmPackageNv> { + pub fn package_reqs(&self) -> HashMap<PackageReq, PackageNv> { self.resolution.package_reqs() } @@ -241,7 +241,7 @@ impl CliNpmResolver { &self, ) -> Result<(), AnyError> { // add and ensure this isn't added to the lockfile - let package_reqs = vec![NpmPackageReq::from_str("@types/node").unwrap()]; + let package_reqs = vec![PackageReq::from_str("@types/node").unwrap()]; self.resolution.add_package_reqs(&package_reqs).await?; self.fs_resolver.cache_packages().await?; @@ -279,7 +279,7 @@ impl NpmResolver for CliNpmResolver { fn resolve_package_folder_from_deno_module( &self, - pkg_nv: &NpmPackageNv, + pkg_nv: &PackageNv, ) -> Result<PathBuf, AnyError> { let pkg_id = self.resolution.resolve_pkg_id_from_deno_module(pkg_nv)?; self.resolve_pkg_folder_from_pkg_id(&pkg_id) @@ -287,7 +287,7 @@ impl NpmResolver for CliNpmResolver { fn resolve_pkg_id_from_pkg_req( &self, - req: &NpmPackageReq, + req: &PackageReq, ) -> Result<NpmPackageId, PackageReqNotFoundError> { self.resolution.resolve_pkg_id_from_pkg_req(req) } |