diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/check.rs | 6 | ||||
| -rw-r--r-- | cli/tools/info.rs | 17 | ||||
| -rw-r--r-- | cli/tools/installer.rs | 1 | ||||
| -rw-r--r-- | cli/tools/repl/session.rs | 2 | ||||
| -rw-r--r-- | cli/tools/task.rs | 4 |
5 files changed, 16 insertions, 14 deletions
diff --git a/cli/tools/check.rs b/cli/tools/check.rs index f2e31b153..85ce44b95 100644 --- a/cli/tools/check.rs +++ b/cli/tools/check.rs @@ -11,8 +11,8 @@ use deno_graph::Module; use deno_graph::ModuleGraph; use deno_runtime::colors; use deno_runtime::deno_node::NodeResolver; -use deno_semver::npm::NpmPackageNv; -use deno_semver::npm::NpmPackageReq; +use deno_semver::package::PackageNv; +use deno_semver::package::PackageReq; use once_cell::sync::Lazy; use regex::Regex; @@ -194,7 +194,7 @@ enum CheckHashResult { /// be used to tell fn get_check_hash( graph: &ModuleGraph, - package_reqs: HashMap<NpmPackageReq, NpmPackageNv>, + package_reqs: HashMap<PackageReq, PackageNv>, type_check_mode: TypeCheckMode, ts_config: &TsConfig, ) -> CheckHashResult { diff --git a/cli/tools/info.rs b/cli/tools/info.rs index 08345887b..c0dd686f8 100644 --- a/cli/tools/info.rs +++ b/cli/tools/info.rs @@ -21,9 +21,9 @@ use deno_npm::resolution::NpmResolutionSnapshot; use deno_npm::NpmPackageId; use deno_npm::NpmResolutionPackage; use deno_runtime::colors; -use deno_semver::npm::NpmPackageNv; use deno_semver::npm::NpmPackageNvReference; use deno_semver::npm::NpmPackageReqReference; +use deno_semver::package::PackageNv; use crate::args::Flags; use crate::args::InfoFlags; @@ -185,7 +185,7 @@ fn add_npm_packages_to_json( .and_then(|specifier| NpmPackageNvReference::from_str(specifier).ok()) .and_then(|package_ref| { snapshot - .resolve_package_from_deno_module(&package_ref.nv) + .resolve_package_from_deno_module(package_ref.nv()) .ok() }); if let Some(pkg) = maybe_package { @@ -220,7 +220,8 @@ fn add_npm_packages_to_json( let specifier = dep.get("specifier").and_then(|s| s.as_str()); if let Some(specifier) = specifier { if let Ok(npm_ref) = NpmPackageReqReference::from_str(specifier) { - if let Ok(pkg) = snapshot.resolve_pkg_from_pkg_req(&npm_ref.req) + if let Ok(pkg) = + snapshot.resolve_pkg_from_pkg_req(npm_ref.req()) { dep.insert( "npmPackage".to_string(), @@ -331,7 +332,7 @@ fn print_tree_node<TWrite: Write>( #[derive(Default)] struct NpmInfo { package_sizes: HashMap<NpmPackageId, u64>, - resolved_ids: HashMap<NpmPackageNv, NpmPackageId>, + resolved_ids: HashMap<PackageNv, NpmPackageId>, packages: HashMap<NpmPackageId, NpmResolutionPackage>, } @@ -348,7 +349,7 @@ impl NpmInfo { for module in graph.modules() { if let Module::Npm(module) = module { - let nv = &module.nv_reference.nv; + let nv = module.nv_reference.nv(); if let Ok(package) = npm_snapshot.resolve_package_from_deno_module(nv) { info.resolved_ids.insert(nv.clone(), package.id.clone()); if !info.packages.contains_key(&package.id) { @@ -382,7 +383,7 @@ impl NpmInfo { pub fn resolve_package( &self, - nv: &NpmPackageNv, + nv: &PackageNv, ) -> Option<&NpmResolutionPackage> { let id = self.resolved_ids.get(nv)?; self.packages.get(id) @@ -542,7 +543,7 @@ impl<'a> GraphDisplayContext<'a> { use PackageOrSpecifier::*; let package_or_specifier = match module.npm() { - Some(npm) => match self.npm_info.resolve_package(&npm.nv_reference.nv) { + Some(npm) => match self.npm_info.resolve_package(npm.nv_reference.nv()) { Some(package) => Package(package.clone()), None => Specifier(module.specifier().clone()), // should never happen }, @@ -615,7 +616,7 @@ impl<'a> GraphDisplayContext<'a> { let maybe_size = self.npm_info.package_sizes.get(dep_id).cloned(); let size_str = maybe_size_to_text(maybe_size); let mut child = TreeNode::from_text(format!( - "npm:{} {}", + "npm:/{} {}", dep_id.as_serialized(), size_str )); diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs index 03c2ffdcf..cabae9e28 100644 --- a/cli/tools/installer.rs +++ b/cli/tools/installer.rs @@ -140,6 +140,7 @@ pub async fn infer_name_from_url(url: &Url) -> Option<String> { } if let Ok(npm_ref) = NpmPackageReqReference::from_specifier(&url) { + let npm_ref = npm_ref.into_inner(); if let Some(sub_path) = npm_ref.sub_path { if !sub_path.contains('/') { return Some(sub_path); diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs index 9261299df..d89cc95c3 100644 --- a/cli/tools/repl/session.rs +++ b/cli/tools/repl/session.rs @@ -505,7 +505,7 @@ impl ReplSession { let npm_imports = resolved_imports .iter() .flat_map(|url| NpmPackageReqReference::from_specifier(url).ok()) - .map(|r| r.req) + .map(|r| r.into_inner().req) .collect::<Vec<_>>(); let has_node_specifier = resolved_imports.iter().any(|url| url.scheme() == "node"); diff --git a/cli/tools/task.rs b/cli/tools/task.rs index f99e7431c..dcb53e4ec 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -13,7 +13,7 @@ use deno_core::error::AnyError; use deno_core::futures; use deno_core::futures::future::LocalBoxFuture; use deno_runtime::deno_node::NodeResolver; -use deno_semver::npm::NpmPackageNv; +use deno_semver::package::PackageNv; use deno_task_shell::ExecuteResult; use deno_task_shell::ShellCommand; use deno_task_shell::ShellCommandContext; @@ -237,7 +237,7 @@ impl ShellCommand for NpxCommand { #[derive(Clone)] struct NpmPackageBinCommand { name: String, - npm_package: NpmPackageNv, + npm_package: PackageNv, } impl ShellCommand for NpmPackageBinCommand { |