mirror of
https://github.com/denoland/deno.git
synced 2025-08-03 18:38:33 +00:00
refactor(npm): create general use NpmPackageResolver
(#15882)
This commit is contained in:
parent
51ba4764d1
commit
73efed218f
17 changed files with 445 additions and 472 deletions
158
cli/npm/resolvers/mod.rs
Normal file
158
cli/npm/resolvers/mod.rs
Normal file
|
@ -0,0 +1,158 @@
|
|||
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
|
||||
|
||||
mod common;
|
||||
mod global;
|
||||
|
||||
use deno_core::anyhow::bail;
|
||||
use deno_core::error::custom_error;
|
||||
use deno_runtime::deno_node::RequireNpmResolver;
|
||||
use global::GlobalNpmPackageResolver;
|
||||
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
use deno_ast::ModuleSpecifier;
|
||||
use deno_core::error::AnyError;
|
||||
|
||||
use self::common::InnerNpmPackageResolver;
|
||||
use super::NpmCache;
|
||||
use super::NpmPackageReq;
|
||||
use super::NpmRegistryApi;
|
||||
|
||||
pub use self::common::LocalNpmPackageInfo;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct NpmPackageResolver {
|
||||
unstable: bool,
|
||||
no_npm: bool,
|
||||
inner: Arc<dyn InnerNpmPackageResolver>,
|
||||
}
|
||||
|
||||
impl NpmPackageResolver {
|
||||
pub fn new(
|
||||
cache: NpmCache,
|
||||
api: NpmRegistryApi,
|
||||
unstable: bool,
|
||||
no_npm: bool,
|
||||
) -> Self {
|
||||
// For now, always create a GlobalNpmPackageResolver, but in the future
|
||||
// this might be a local node_modules folder
|
||||
let inner = Arc::new(GlobalNpmPackageResolver::new(cache, api));
|
||||
Self {
|
||||
unstable,
|
||||
no_npm,
|
||||
inner,
|
||||
}
|
||||
}
|
||||
|
||||
/// Resolves an npm package from a Deno module.
|
||||
pub fn resolve_package_from_deno_module(
|
||||
&self,
|
||||
pkg_req: &NpmPackageReq,
|
||||
) -> Result<LocalNpmPackageInfo, AnyError> {
|
||||
self.inner.resolve_package_from_deno_module(pkg_req)
|
||||
}
|
||||
|
||||
/// Resolves an npm package from an npm package referrer.
|
||||
pub fn resolve_package_from_package(
|
||||
&self,
|
||||
name: &str,
|
||||
referrer: &ModuleSpecifier,
|
||||
) -> Result<LocalNpmPackageInfo, AnyError> {
|
||||
self.inner.resolve_package_from_package(name, referrer)
|
||||
}
|
||||
|
||||
/// Resolve the root folder of the package the provided specifier is in.
|
||||
///
|
||||
/// This will error when the provided specifier is not in an npm package.
|
||||
pub fn resolve_package_from_specifier(
|
||||
&self,
|
||||
specifier: &ModuleSpecifier,
|
||||
) -> Result<LocalNpmPackageInfo, AnyError> {
|
||||
self.inner.resolve_package_from_specifier(specifier)
|
||||
}
|
||||
|
||||
/// Gets if the provided specifier is in an npm package.
|
||||
pub fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool {
|
||||
self.resolve_package_from_specifier(specifier).is_ok()
|
||||
}
|
||||
|
||||
/// If the resolver has resolved any npm packages.
|
||||
pub fn has_packages(&self) -> bool {
|
||||
self.inner.has_packages()
|
||||
}
|
||||
|
||||
/// Adds a package requirement to the resolver and ensures everything is setup.
|
||||
pub async fn add_package_reqs(
|
||||
&self,
|
||||
packages: Vec<NpmPackageReq>,
|
||||
) -> Result<(), AnyError> {
|
||||
assert!(!packages.is_empty());
|
||||
|
||||
if !self.unstable {
|
||||
bail!(
|
||||
"Unstable use of npm specifiers. The --unstable flag must be provided."
|
||||
)
|
||||
}
|
||||
|
||||
if self.no_npm {
|
||||
let fmt_reqs = packages
|
||||
.iter()
|
||||
.map(|p| format!("\"{}\"", p))
|
||||
.collect::<Vec<_>>()
|
||||
.join(", ");
|
||||
return Err(custom_error(
|
||||
"NoNpm",
|
||||
format!(
|
||||
"Following npm specifiers were requested: {}; but --no-npm is specified.",
|
||||
fmt_reqs
|
||||
),
|
||||
));
|
||||
}
|
||||
|
||||
self.inner.add_package_reqs(packages).await
|
||||
}
|
||||
}
|
||||
|
||||
impl RequireNpmResolver for NpmPackageResolver {
|
||||
fn resolve_package_folder_from_package(
|
||||
&self,
|
||||
specifier: &str,
|
||||
referrer: &std::path::Path,
|
||||
) -> Result<PathBuf, AnyError> {
|
||||
let referrer = specifier_to_path(referrer)?;
|
||||
self
|
||||
.resolve_package_from_package(specifier, &referrer)
|
||||
.map(|p| p.folder_path)
|
||||
}
|
||||
|
||||
fn resolve_package_folder_from_path(
|
||||
&self,
|
||||
path: &Path,
|
||||
) -> Result<PathBuf, AnyError> {
|
||||
let specifier = specifier_to_path(path)?;
|
||||
self
|
||||
.resolve_package_from_specifier(&specifier)
|
||||
.map(|p| p.folder_path)
|
||||
}
|
||||
|
||||
fn in_npm_package(&self, path: &Path) -> bool {
|
||||
let specifier = match ModuleSpecifier::from_file_path(path) {
|
||||
Ok(p) => p,
|
||||
Err(_) => return false,
|
||||
};
|
||||
self.resolve_package_from_specifier(&specifier).is_ok()
|
||||
}
|
||||
|
||||
fn ensure_read_permission(&self, path: &Path) -> Result<(), AnyError> {
|
||||
self.inner.ensure_read_permission(path)
|
||||
}
|
||||
}
|
||||
|
||||
fn specifier_to_path(path: &Path) -> Result<ModuleSpecifier, AnyError> {
|
||||
match ModuleSpecifier::from_file_path(&path) {
|
||||
Ok(specifier) => Ok(specifier),
|
||||
Err(()) => bail!("Could not convert '{}' to url.", path.display()),
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue