foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

refactor(npm): remove needless resolve_nv_ref_from_pkg_req_ref on NpmResolver (#19582)

Browse source
This commit is contained in:
David Sherret 2023-06-22 05:50:48 -04:00 • committed by GitHub
parent 4e01356586
commit 1301a03b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cli/npm/resolution.rs
View file

@ -24,9 +24,7 @@ use deno_npm::NpmPackageId;
use deno_npm::NpmResolutionPackage; use deno_npm::NpmResolutionPackage;
use deno_npm::NpmSystemInfo; use deno_npm::NpmSystemInfo;
use deno_semver::npm::NpmPackageNv; use deno_semver::npm::NpmPackageNv;
use deno_semver::npm::NpmPackageNvReference;
use deno_semver::npm::NpmPackageReq; use deno_semver::npm::NpmPackageReq;
use deno_semver::npm::NpmPackageReqReference;
use deno_semver::VersionReq; use deno_semver::VersionReq;
use crate::args::Lockfile; use crate::args::Lockfile;
@ -154,17 +152,6 @@ impl NpmResolution {
Ok(()) Ok(())
} }
pub fn resolve_nv_ref_from_pkg_req_ref(
&self,
req_ref: &NpmPackageReqReference,
) -> Result<NpmPackageNvReference, PackageReqNotFoundError> {
let node_id = self.resolve_pkg_id_from_pkg_req(&req_ref.req)?;
Ok(NpmPackageNvReference {
nv: node_id.nv,
sub_path: req_ref.sub_path.clone(),
})
}
pub fn resolve_package_cache_folder_id_from_id( pub fn resolve_package_cache_folder_id_from_id(
&self, &self,
id: &NpmPackageId, id: &NpmPackageId,

9
cli/npm/resolvers/mod.rs
View file

@ -25,9 +25,7 @@ use deno_runtime::deno_node::NodeResolutionMode;
use deno_runtime::deno_node::NpmResolver; use deno_runtime::deno_node::NpmResolver;
use deno_runtime::deno_node::PathClean; use deno_runtime::deno_node::PathClean;
use deno_semver::npm::NpmPackageNv; use deno_semver::npm::NpmPackageNv;
use deno_semver::npm::NpmPackageNvReference;
use deno_semver::npm::NpmPackageReq; use deno_semver::npm::NpmPackageReq;
use deno_semver::npm::NpmPackageReqReference;
use global::GlobalNpmPackageResolver; use global::GlobalNpmPackageResolver;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;
@ -275,13 +273,6 @@ impl NpmResolver for CliNpmResolver {
self.resolution.resolve_pkg_id_from_pkg_req(req) self.resolution.resolve_pkg_id_from_pkg_req(req)
} }
fn resolve_nv_ref_from_pkg_req_ref(
&self,
req_ref: &NpmPackageReqReference,
) -> Result<NpmPackageNvReference, PackageReqNotFoundError> {
self.resolution.resolve_nv_ref_from_pkg_req_ref(req_ref)
}
fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool { fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool {
self self
.resolve_package_folder_from_specifier(specifier) .resolve_package_folder_from_specifier(specifier)

7
ext/node/lib.rs
View file

@ -17,9 +17,7 @@ use deno_fs::sync::MaybeSync;
use deno_npm::resolution::PackageReqNotFoundError; use deno_npm::resolution::PackageReqNotFoundError;
use deno_npm::NpmPackageId; use deno_npm::NpmPackageId;
use deno_semver::npm::NpmPackageNv; use deno_semver::npm::NpmPackageNv;
use deno_semver::npm::NpmPackageNvReference;
use deno_semver::npm::NpmPackageReq; use deno_semver::npm::NpmPackageReq;
use deno_semver::npm::NpmPackageReqReference;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
pub mod analyze; pub mod analyze;
@ -93,11 +91,6 @@ pub trait NpmResolver: std::fmt::Debug + MaybeSend + MaybeSync {
req: &NpmPackageReq, req: &NpmPackageReq,
) -> Result<NpmPackageId, PackageReqNotFoundError>; ) -> Result<NpmPackageId, PackageReqNotFoundError>;
fn resolve_nv_ref_from_pkg_req_ref(
&self,
req_ref: &NpmPackageReqReference,
) -> Result<NpmPackageNvReference, PackageReqNotFoundError>;
fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool; fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool;
fn in_npm_package_at_path(&self, path: &Path) -> bool { fn in_npm_package_at_path(&self, path: &Path) -> bool {

8
ext/node/resolution.rs
View file

@ -310,9 +310,13 @@ impl NodeResolver {
mode: NodeResolutionMode, mode: NodeResolutionMode,
permissions: &dyn NodePermissions, permissions: &dyn NodePermissions,
) -> Result<Option<NodeResolution>, AnyError> { ) -> Result<Option<NodeResolution>, AnyError> {
let reference = self let pkg_id = self
.npm_resolver .npm_resolver
.resolve_nv_ref_from_pkg_req_ref(reference)?; .resolve_pkg_id_from_pkg_req(&reference.req)?;
let reference = NpmPackageNvReference {
nv: pkg_id.nv,
sub_path: reference.sub_path.clone(),
};
self.resolve_npm_reference(&reference, mode, permissions) self.resolve_npm_reference(&reference, mode, permissions)
} }